diff --git a/.drone.yml b/.drone.yml index f30a72c..cdd46d0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,7 +2,7 @@ kind: pipeline name: homepage steps: -- name: build and publish +- name: build angestoepselt site image: plugins/docker settings: registry: codeberg.org @@ -13,13 +13,28 @@ steps: repo: codeberg.org/angestoepselt/homepage build_args: - SITE=angestoepselt - tags: ${DRONE_BRANCH} + tags: angestoepselt-${DRONE_BRANCH} -- name: deploy stage build +- name: build coderdojo site + image: plugins/docker + settings: + registry: codeberg.org + username: + from_secret: registry_username + password: + from_secret: registry_password + repo: codeberg.org/angestoepselt/homepage + build_args: + - SITE=coderdojo + tags: coderdojo-${DRONE_BRANCH} + +- name: deploy angestoepselt staging image: plugins/webhook settings: urls: from_secret: portainer_stage_url + depends_on: + - build angestoepselt site when: branch: - captcha @@ -29,6 +44,9 @@ steps: settings: urls: from_secret: portainer_main_url + depends_on: + - build angestoepselt site + - build coderdojo site when: branch: - main @@ -51,8 +69,10 @@ steps: "owner": "{{ repo.owner }}", "repo": "{{ repo.name }}" } + depends_on: + - deploy live build trigger: branch: - main - - captcha \ No newline at end of file + - captcha diff --git a/docker-compose.yml b/docker-compose.yml index aafe0e4..d177292 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,9 +2,9 @@ version: '3' services: - homepage: - image: codeberg.org/angestoepselt/homepage:${BRANCH:-main} - container_name: homepage-${BRANCH:-main} + angestoepselt: + image: codeberg.org/angestoepselt/homepage:angestoepselt-${BRANCH:-main} + container_name: homepage-angestoepselt-${BRANCH:-main} restart: unless-stopped env_file: stack.env security_opt: @@ -12,7 +12,25 @@ services: labels: - "traefik.enable=true" - "traefik.docker.network=proxy" - - "traefik.http.routers.homepage-${BRANCH:-main}-secure.rule=Host(`${DOMAIN}`,`www.${DOMAIN}`)" + - "traefik.http.routers.homepage-${BRANCH:-main}-secure.rule=Host(`${ANGESTOEPSELT_DOMAIN}`,`www.${ANGESTOEPSELT_DOMAIN}`)" + - "traefik.http.routers.homepage-${BRANCH:-main}-secure.entrypoints=websecure" + - "traefik.http.routers.homepage-${BRANCH:-main}-secure.tls.certresolver=letsencrypt" + - "traefik.http.routers.homepage-${BRANCH:-main}-secure.tls=true" + - "traefik.http.routers.homepage-${BRANCH:-main}.middlewares=redirect-www-to-non-www@file" + networks: + - proxy + + coderdojo: + image: codeberg.org/angestoepselt/homepage:coderdojo-${BRANCH:-main} + container_name: homepage-coderdojo-${BRANCH:-main} + restart: unless-stopped + env_file: stack.env + security_opt: + - no-new-privileges:true + labels: + - "traefik.enable=true" + - "traefik.docker.network=proxy" + - "traefik.http.routers.homepage-${BRANCH:-main}-secure.rule=Host(`${CODERDOJO_DOMAIN}`,`www.${CODERDOJO_DOMAIN}`)" - "traefik.http.routers.homepage-${BRANCH:-main}-secure.entrypoints=websecure" - "traefik.http.routers.homepage-${BRANCH:-main}-secure.tls.certresolver=letsencrypt" - "traefik.http.routers.homepage-${BRANCH:-main}-secure.tls=true" @@ -22,4 +40,4 @@ services: networks: proxy: - external: true \ No newline at end of file + external: true