From dae3d257364f3874b024a6df139f8647046eaa9e Mon Sep 17 00:00:00 2001 From: Roxie Gibson Date: Wed, 16 Feb 2022 01:00:54 +0000 Subject: [PATCH 1/4] added build files --- .drone.yml | 28 ++++++++++++++++++++++++++++ Dockerfile | 3 +++ compose.yml | 19 +++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 .drone.yml create mode 100644 Dockerfile create mode 100644 compose.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..faf2104 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,28 @@ +--- +kind: pipeline +type: docker +name: deployment +steps: + - name: docker build hexbomb.gay + image: plugins/docker + settings: + username: thecoopcloud + password: + from_secret: docker_reg_passwd_coopcloud + repo: thecoopcloud/hexbomb.gay + tags: latest + + - name: deployment hexbomb.gay + image: thecoopcloud/stack-ssh-deploy:latest + settings: + stack: cfa-techdoc_${DRONE_BRANCH} + reg_user: + from_secret: docker_reg_username_coopcloud + reg_pass: + from_secret: docker_reg_passwd_coopcloud + deploy_key: + from_secret: drone_ssh_swarm.autonomic.zone + rm: true + host: swarm.autonomic.zone + compose: compose.yml + image: thecoopcloud/hexbomb.gay diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..0fd82d9 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,3 @@ +FROM nginx:1.21.4 + +COPY ./ /usr/share/nginx/html diff --git a/compose.yml b/compose.yml new file mode 100644 index 0000000..540d6d8 --- /dev/null +++ b/compose.yml @@ -0,0 +1,19 @@ +version: "3.8" + +services: + web: + image: thecoopcloud/hexbomb.gay:latest + networks: + - proxy + deploy: + labels: + - "traefik.enable=true" + - "traefik.http.services.hexbomb_gay.loadbalancer.server.port=80" + - "traefik.http.routers.hexbomb_gay.rule=Host(`www.hexbomb.gay`)" + - "traefik.http.routers.hexbomb_gay.entrypoints=web-secure" + - "traefik.http.routers.hexbomb_gay.tls.certresolver=production" + + +networks: + proxy: + external: true \ No newline at end of file -- 2.40.1 From 132024cba527e9c59ccfef51d2268d7a9c155c9f Mon Sep 17 00:00:00 2001 From: Roxie Gibson Date: Wed, 16 Feb 2022 01:16:25 +0000 Subject: [PATCH 2/4] fixed deploy for new secrets --- .drone.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index faf2104..e905666 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,21 +8,19 @@ steps: settings: username: thecoopcloud password: - from_secret: docker_reg_passwd_coopcloud + from_secret: thecoopcloud_password repo: thecoopcloud/hexbomb.gay tags: latest - name: deployment hexbomb.gay image: thecoopcloud/stack-ssh-deploy:latest settings: - stack: cfa-techdoc_${DRONE_BRANCH} - reg_user: - from_secret: docker_reg_username_coopcloud - reg_pass: - from_secret: docker_reg_passwd_coopcloud + stack: hexbomb_gay deploy_key: from_secret: drone_ssh_swarm.autonomic.zone rm: true host: swarm.autonomic.zone compose: compose.yml image: thecoopcloud/hexbomb.gay + depends_on: + - build static -- 2.40.1 From a50e59677c6607aa5b9bf8c16f66daae445bf889 Mon Sep 17 00:00:00 2001 From: Roxie Gibson Date: Wed, 16 Feb 2022 01:18:12 +0000 Subject: [PATCH 3/4] forgot to edit depends on --- .drone.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index e905666..6d24491 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,6 +21,4 @@ steps: rm: true host: swarm.autonomic.zone compose: compose.yml - image: thecoopcloud/hexbomb.gay - depends_on: - - build static + image: thecoopcloud/hexbomb.gay \ No newline at end of file -- 2.40.1 From bde7d46dc0de3a4eadd77bfc8d03acd413e173db Mon Sep 17 00:00:00 2001 From: Roxie Gibson Date: Wed, 16 Feb 2022 01:42:45 +0000 Subject: [PATCH 4/4] fix docker compose i guess --- compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compose.yml b/compose.yml index 540d6d8..8e491de 100644 --- a/compose.yml +++ b/compose.yml @@ -4,15 +4,15 @@ services: web: image: thecoopcloud/hexbomb.gay:latest networks: - - proxy + - proxy deploy: labels: - "traefik.enable=true" - - "traefik.http.services.hexbomb_gay.loadbalancer.server.port=80" - - "traefik.http.routers.hexbomb_gay.rule=Host(`www.hexbomb.gay`)" - - "traefik.http.routers.hexbomb_gay.entrypoints=web-secure" - - "traefik.http.routers.hexbomb_gay.tls.certresolver=production" - + - "traefik.docker.network=proxy" + - "traefik.http.services.hexbomb-gay.loadbalancer.server.port=80" + - "traefik.http.routers.hexbomb-gay.rule=Host(`www.hexbomb.gay`, `hexbomb.gay`)" + - "traefik.http.routers.hexbomb-gay.entrypoints=web-secure" + - "traefik.http.routers.hexbomb-gay.tls.certresolver=production" networks: proxy: -- 2.40.1