diff --git a/Dockerfile b/Dockerfile index 5a032ec..b192846 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,3 @@ FROM docker.triton2.fet.at/openrestyfet -COPY . /etc/nginx/conf.d/ +COPY ./conf.d/* /etc/nginx/conf.d/ +ENV PATH "$PATH:/usr/local/openresty/bin" \ No newline at end of file diff --git a/andis/jenkins.fet.at b/conf.d/andis/jenkins.fet.at similarity index 100% rename from andis/jenkins.fet.at rename to conf.d/andis/jenkins.fet.at diff --git a/andis/jenkins2.fet.at b/conf.d/andis/jenkins2.fet.at similarity index 100% rename from andis/jenkins2.fet.at rename to conf.d/andis/jenkins2.fet.at diff --git a/andis/nginx.fet.at b/conf.d/andis/nginx.fet.at similarity index 100% rename from andis/nginx.fet.at rename to conf.d/andis/nginx.fet.at diff --git a/default.conf b/conf.d/default.conf similarity index 100% rename from default.conf rename to conf.d/default.conf diff --git a/dev/devdoc.conf b/conf.d/dev/devdoc.conf similarity index 100% rename from dev/devdoc.conf rename to conf.d/dev/devdoc.conf diff --git a/dev/devnginx.conf b/conf.d/dev/devnginx.conf similarity index 100% rename from dev/devnginx.conf rename to conf.d/dev/devnginx.conf diff --git a/dev/docker.nginx.fet.at b/conf.d/dev/docker.nginx.fet.at similarity index 100% rename from dev/docker.nginx.fet.at rename to conf.d/dev/docker.nginx.fet.at diff --git a/fet.at/fet.at.conf b/conf.d/fet.at/fet.at.conf similarity index 100% rename from fet.at/fet.at.conf rename to conf.d/fet.at/fet.at.conf diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..528c4da --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,19 @@ +version: '2' +services: + openresty: + image: openrestyfetfull:latest + ports: + - "80:80" + - "443:443" + volumes: + - nginxconf:/etc/nginx/conf.d/ + theiaconf: + image: docker.triton2.fet.at/dev_theia + volumes: + - nginxconf:/home/project + - /var/run/docker.sock:/var/run/docker.sock +volumes: + data_dev: + driver: local + nginxconf: + driver: local \ No newline at end of file