diff --git a/dockerfiles/Dockerfile.theia b/Dockerfile similarity index 85% rename from dockerfiles/Dockerfile.theia rename to Dockerfile index 0d51304..4d04280 100644 --- a/dockerfiles/Dockerfile.theia +++ b/Dockerfile @@ -5,8 +5,8 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* # Install docker for the container to enable access to a docker host if socket is mounted -RUN wget https://download.docker.com/linux/static/stable/x86_64/docker-20.10.2.tgz \ - && tar -xvf docker-20.10.2.tgz docker/docker && cp docker/docker /usr/bin/ +RUN wget https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz \ + && tar -xvf docker-20.10.9.tgz docker/docker && cp docker/docker /usr/bin/ # Install Python requirements to support development @@ -15,6 +15,5 @@ run pip3 install --upgrade pip \ && pip3 install -r requirements.txt \ && pip3 install pytest pylint bandit flake8 black pytest-django six pytest-mock -COPY . /home/development #ENTRYPOINT node /home/theia/src-gen/backend/main.js /home/project/ --hostname=0.0.0.0 \ No newline at end of file diff --git a/README.md b/README.md index 179c7d3..07b4d03 100644 --- a/README.md +++ b/README.md @@ -3,5 +3,5 @@ # About Dieses kleine Projekt zeigt wie mit Docker und einigen Tools eine kleine Online Entwicklungsumgebung aufgesetzt werden kann. Primär ist diese Umgebung für Python Projekte gedacht, kann aber insbesondere auch für Node.js und andere Themen genutzt werden. - +Diese Entwicklungsumgebung wird/wurde für die Entwicklung der Fetsite 2020 benutzt. diff --git a/dockerfiles/Dockerfile.nginx b/archive/Dockerfile.nginx similarity index 100% rename from dockerfiles/Dockerfile.nginx rename to archive/Dockerfile.nginx diff --git a/config/default.conf b/archive/default.conf similarity index 100% rename from config/default.conf rename to archive/default.conf diff --git a/docker-compose.single.yml b/archive/docker-compose.yml similarity index 56% rename from docker-compose.single.yml rename to archive/docker-compose.yml index f145000..d494bd5 100644 --- a/docker-compose.single.yml +++ b/archive/docker-compose.yml @@ -1,10 +1,14 @@ version: '2' services: + nginx: + image: docker.triton2.fet.at/dev_nginx + ports: + - "${PORT}:80" theia: image: docker.triton2.fet.at/dev_theia volumes: - /var/run/docker.sock:/var/run/docker.sock - - data_dev:/home/project + - data_dev:/home volumes: data_dev: - driver: local \ No newline at end of file + driver: local diff --git a/build_push b/build_push index 80ad873..413932c 100755 --- a/build_push +++ b/build_push @@ -3,9 +3,9 @@ export REGISTRY="docker.triton2.fet.at" docker login $REGISTRY # build a small nginx image to handle routing of /dev and other services -docker build --no-cache -f dockerfiles/Dockerfile.nginx -t $REGISTRY/dev_nginx:latest . -docker push $REGISTRY/dev_nginx:latest +#docker build --no-cache -f dockerfiles/Dockerfile.nginx -t $REGISTRY/dev_nginx:latest . +#docker push $REGISTRY/dev_nginx:latest # Build a development Image with Theia and all content -docker build --no-cache -f dockerfiles/Dockerfile.theia -t $REGISTRY/dev_theia:latest . +docker build --no-cache -t $REGISTRY/dev_theia:latest . docker push $REGISTRY/dev_theia:latest \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index d494bd5..f145000 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,14 +1,10 @@ version: '2' services: - nginx: - image: docker.triton2.fet.at/dev_nginx - ports: - - "${PORT}:80" theia: image: docker.triton2.fet.at/dev_theia volumes: - /var/run/docker.sock:/var/run/docker.sock - - data_dev:/home + - data_dev:/home/project volumes: data_dev: - driver: local + driver: local \ No newline at end of file