diff --git a/Layerfile b/Layerfile index f2eb7e1..4fa5c4f 100644 --- a/Layerfile +++ b/Layerfile @@ -2,11 +2,14 @@ FROM vm/ubuntu:18.04 # install docker-ce (from tutorial for ubuntu) RUN apt-get update && \ - apt-get install apt-transport-https ca-certificates curl software-properties-common && \ - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \ - add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable" && \ + apt-get install ca-certificates curl gnupg lsb-release && \ + sudo mkdir -p /etc/apt/keyrings && \ + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \ + echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" |\ + sudo tee /etc/apt/sources.list.d/docker.list > /dev/null && \ apt-get update && \ - apt install docker-ce + apt-get install docker-ce docker-ce-cli containerd.io # install docker compose RUN curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose && \ @@ -15,7 +18,10 @@ RUN curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-c # copy the root (i.e., repository root) to /root in the runner COPY / /root -RUN REPEATABLE docker-compose up -d --build --force-recreate --remove-orphans && sleep 6 +# TODO: log in to docker hub +# See https://webapp.io/docs/advanced-workflows#logging-in-to-docker to learn how to log in to docker -EXPOSE WEBSITE localhost:8000 +RUN REPEATABLE docker-compose build --parallel +RUN docker-compose up -d +RUN docker-compose exec cypress bash /app/run_tests.sh diff --git a/services/web/src/views/main/main.css b/services/web/src/views/main/main.css index 1c45a11..5278b38 100644 --- a/services/web/src/views/main/main.css +++ b/services/web/src/views/main/main.css @@ -16,11 +16,11 @@ body { } .mainBody header { - background: #0c5db8; + background: #5d0cb8; } .mainBody .sidebar { - background: #1c4784; + background: #471c84; height: auto; flex: 0 0 200px; } @@ -88,4 +88,4 @@ header { background: #fff; border-radius: 5px; border: 1px solid #000; -} \ No newline at end of file +}