From: Dessalines Date: Fri, 5 Nov 2021 21:49:15 +0000 (-0400) Subject: Stop using lemmy-ui:dev images (#1880) X-Git-Url: http://these/git/readmes/%7B%60https:/%22https:/hacktivis.me/static/%24%7Bsrc%7D?a=commitdiff_plain;h=44b5fe0631f6bab10811f07201edf18309e6a7fe;p=lemmy.git Stop using lemmy-ui:dev images (#1880) * Stop using lemmy-ui:dev images * Dont publish dev docker images with drone. --- diff --git a/.drone.yml b/.drone.yml index e96fee7c..a4e44b33 100644 --- a/.drone.yml +++ b/.drone.yml @@ -62,38 +62,6 @@ steps: - yarn - yarn api-test - - name: publish dev docker image - image: plugins/docker - settings: - dockerfile: docker/prod/Dockerfile - username: - from_secret: docker_username - password: - from_secret: docker_password - repo: dessalines/lemmy - tags: - - dev-linux-amd64 - when: - ref: - - refs/heads/main - - - name: publish dev docker manifest - image: plugins/manifest - settings: - username: - from_secret: docker_username - password: - from_secret: docker_password - target: "dessalines/lemmy:dev" - template: "dessalines/lemmy:dev-OS-ARCH" - platforms: - - linux/amd64 - - linux/arm64 - ignore_missing: true - when: - ref: - - refs/heads/main - - name: publish release docker image image: plugins/docker settings: @@ -205,38 +173,6 @@ steps: - yarn - yarn api-test - - name: publish dev docker image - image: plugins/docker - settings: - dockerfile: docker/prod/Dockerfile.arm - username: - from_secret: docker_username - password: - from_secret: docker_password - repo: dessalines/lemmy - tags: - - dev-linux-arm64 - when: - ref: - - refs/heads/main - - - name: publish dev docker manifest - image: plugins/manifest - settings: - username: - from_secret: docker_username - password: - from_secret: docker_password - target: "dessalines/lemmy:dev" - template: "dessalines/lemmy:dev-OS-ARCH" - platforms: - - linux/amd64 - - linux/arm64 - ignore_missing: true - when: - ref: - - refs/heads/main - - name: publish release docker image image: plugins/docker settings: diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index e1ea333a..efc1ac07 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -26,7 +26,7 @@ services: - postgres lemmy-ui: - image: dessalines/lemmy-ui:dev + image: dessalines/lemmy-ui:0.13.0 restart: always environment: - LEMMY_INTERNAL_HOST=lemmy:8536 diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index bcd4f914..294bb37f 100644 --- a/docker/federation/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -86,7 +86,7 @@ services: - ./volumes/postgres_beta:/var/lib/postgresql/data lemmy-gamma-ui: - image: dessalines/lemmy-ui:dev + image: dessalines/lemmy-ui:0.13.0 environment: - LEMMY_INTERNAL_HOST=lemmy-gamma:8561 - LEMMY_EXTERNAL_HOST=localhost:8561 @@ -116,7 +116,7 @@ services: # An instance with only an allowlist for beta lemmy-delta-ui: - image: dessalines/lemmy-ui:dev + image: dessalines/lemmy-ui:0.13.0 environment: - LEMMY_INTERNAL_HOST=lemmy-delta:8571 - LEMMY_EXTERNAL_HOST=localhost:8571 @@ -146,7 +146,7 @@ services: # An instance who has a blocklist, with lemmy-alpha blocked lemmy-epsilon-ui: - image: dessalines/lemmy-ui:dev + image: dessalines/lemmy-ui:0.13.3 environment: - LEMMY_INTERNAL_HOST=lemmy-epsilon:8581 - LEMMY_EXTERNAL_HOST=localhost:8581 diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh index bc31bb62..cfdc83b2 100755 --- a/docker/prod/deploy.sh +++ b/docker/prod/deploy.sh @@ -10,6 +10,8 @@ third_semver=$(echo $new_tag | cut -d "." -f 3) if [ ! -z "${third_semver##*[!0-9]*}" ]; then sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../prod/docker-compose.yml sed -i "s/dessalines\/lemmy-ui:.*/dessalines\/lemmy-ui:$new_tag/" ../prod/docker-compose.yml + sed -i "s/dessalines\/lemmy-ui:.*/dessalines\/lemmy-ui:$new_tag/" ../dev/docker-compose.yml + sed -i "s/dessalines\/lemmy-ui:.*/dessalines\/lemmy-ui:$new_tag/" ../federation/docker-compose.yml git add ../prod/docker-compose.yml # Setting the version for Ansible