diff --git a/docker/conf/nginx.conf b/docker/conf/nginx.conf index 4511e53..b258ea6 100644 --- a/docker/conf/nginx.conf +++ b/docker/conf/nginx.conf @@ -48,5 +48,5 @@ http { } } - include applications/*.conf; + include conf.d/*.conf; } diff --git a/docker/gitlab.sh b/docker/gitlab.sh deleted file mode 100755 index dfe6661..0000000 --- a/docker/gitlab.sh +++ /dev/null @@ -1,12 +0,0 @@ -docker run --detach \ - --name gitlab \ - --publish 8001:80 \ - --publish 44301:443 \ - --publish 2201:22 \ - --hostname gitlab.c2a-system.dev \ - --env GITLAB_OMNIBUS_CONFIG="external_url 'http://gitlab.c2a-system.dev/'; gitlab_rails['gitlab_shell_ssh_port'] = 2201;" \ - --volume /srv/gitlab/config:/etc/gitlab \ - --volume /srv/gitlab/logs:/var/log/gitlab \ - --volume /srv/gitlab/data:/var/opt/gitlab \ - --restart unless-stopped \ - gitlab/gitlab-ce:latest diff --git a/docker/install-nginx.sh b/docker/install-nginx.sh index a0d132c..75b6cb3 100755 --- a/docker/install-nginx.sh +++ b/docker/install-nginx.sh @@ -1,5 +1,5 @@ +apt-get install nginx + cp ./docker/conf/nginx.conf /etc/nginx/ cp ./docker/conf/mime.types /etc/nginx/ cp ./docker/conf/applications/* /etc/nginx/conf.d/ - -apt-get install nginx diff --git a/docker/portainer.sh b/docker/portainer.sh deleted file mode 100755 index d1f9d58..0000000 --- a/docker/portainer.sh +++ /dev/null @@ -1,8 +0,0 @@ -docker volume create portainer_data; -docker run --detach \ - --name portainer \ - --publish 8003:9000 \ - --volume /var/run/docker.sock:/var/run/docker.sock \ - --volume portainer_data:/data \ - --restart unless-stopped \ - portainer/portainer:latest diff --git a/install.sh b/install.sh index 50d7fd2..b0127eb 100755 --- a/install.sh +++ b/install.sh @@ -20,3 +20,6 @@ apt-get install docker-ce docker-ce-cli containerd.io # Launch Install Script ./docker/install-nginx.sh +./docker/install-portainer.sh + +service nginx restart