Merge pull request #1344 from LemmyNet/remove_travis_and_federation_docker

Removing docker/federation and docker/travis folders.
2024-11-21 22:27:08 +00:00 · 2021-01-15 12:40:34 -05:00 · 2021-01-15 12:40:34 -05:00 · b3163f99f4
parent f0d928a433 fe4b516bd9
commit b3163f99f4
6 changed files with 2 additions and 230 deletions
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 <div align="center">

 ![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/LemmyNet/lemmy.svg)
-[![Build Status](https://travis-ci.org/LemmyNet/lemmy.svg?branch=main)](https://travis-ci.org/LemmyNet/lemmy)
+![Build Status](https://cloud.drone.io/api/badges/LemmyNet/lemmy/status.svg)
 [![GitHub issues](https://img.shields.io/github/issues-raw/LemmyNet/lemmy.svg)](https://github.com/LemmyNet/lemmy/issues)
 [![Docker Pulls](https://img.shields.io/docker/pulls/dessalines/lemmy.svg)](https://cloud.docker.com/repository/docker/dessalines/lemmy/)
 [![Translation status](http://weblate.yerbamate.ml/widgets/lemmy/-/lemmy/svg-badge.svg)](http://weblate.yerbamate.ml/engage/lemmy/)
--- a/docker/federation/run-tests.bash
+++ b/docker/federation/run-tests.bash
@ -1,31 +0,0 @@
-#!/bin/bash
-set -e
-
-# make sure there are no old containers or old data around
-sudo docker-compose down
-sudo rm -rf volumes
-
-mkdir -p volumes/pictrs_{alpha,beta,gamma,delta,epsilon}
-sudo chown -R 991:991 volumes/pictrs_{alpha,beta,gamma,delta,epsilon}
-
-sudo docker build ../../ --file ../dev/Dockerfile --tag lemmy-federation:latest
-
-sudo mkdir -p volumes/pictrs_alpha
-sudo chown -R 991:991 volumes/pictrs_alpha
-
-sudo docker-compose up -d
-
-pushd ../../api_tests
-echo "Waiting for Lemmy to start..."
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8541/api/v1/site')" != "200" ]]; do sleep 1; done
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8551/api/v1/site')" != "200" ]]; do sleep 1; done
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8561/api/v1/site')" != "200" ]]; do sleep 1; done
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8571/api/v1/site')" != "200" ]]; do sleep 1; done
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8581/api/v1/site')" != "200" ]]; do sleep 1; done
-yarn
-yarn api-test || true
-popd
-
-sudo docker-compose down
-
-sudo rm -r volumes
--- a/docker/prod/deploy.sh
+++ b/docker/prod/deploy.sh
@ -20,21 +20,16 @@ cd docker/prod || exit
 # Changing various references to the Lemmy version
 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
-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:v.*/dessalines\/lemmy:$new_tag/" ../travis/docker_push.sh
+sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../prod/docker-compose.yml

 git add ../dev/docker-compose.yml
-git add ../federation/docker-compose.yml
 git add ../prod/docker-compose.yml
-git add ../travis/docker_push.sh

 # The commit
 git commit -m"Version $new_tag"
 git tag $new_tag

-# Now doing the building on travis, but leave this in for when you need to do an arm build
-
 # export COMPOSE_DOCKER_CLI_BUILD=1
 # export DOCKER_BUILDKIT=1

--- a/docker/travis/docker-compose.yml
+++ b/docker/travis/docker-compose.yml
@ -1,159 +0,0 @@
-version: '3.3'
-
-services:
-  lemmy-alpha:
-    image: dessalines/lemmy:travis
-    environment:
-      - LEMMY_HOSTNAME=lemmy-alpha:8541
-      - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_alpha:5432/lemmy
-      - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FEDERATION__ENABLED=true
-      - LEMMY_TLS_ENABLED=false
-      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon
-      - LEMMY_PORT=8541
-      - LEMMY_SETUP__ADMIN_USERNAME=lemmy_alpha
-      - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
-      - LEMMY_SETUP__SITE_NAME=lemmy-alpha
-      - LEMMY_RATE_LIMIT__POST=99999
-      - LEMMY_RATE_LIMIT__REGISTER=99999
-      - LEMMY_CAPTCHA__ENABLED=false
-      - RUST_BACKTRACE=1
-      - RUST_LOG=debug
-    depends_on:
-      - postgres_alpha
-    ports: 
-      - "8541:8541"
-  postgres_alpha:
-    image: postgres:12-alpine
-    environment:
-      - POSTGRES_USER=lemmy
-      - POSTGRES_PASSWORD=password
-      - POSTGRES_DB=lemmy
-    volumes:
-      - ./volumes/postgres_alpha:/var/lib/postgresql/data
-
-  lemmy-beta:
-    image: dessalines/lemmy:travis
-    environment:
-      - LEMMY_HOSTNAME=lemmy-beta:8551
-      - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_beta:5432/lemmy
-      - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FEDERATION__ENABLED=true
-      - LEMMY_TLS_ENABLED=false
-      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-gamma,lemmy-delta,lemmy-epsilon
-      - LEMMY_PORT=8551
-      - LEMMY_SETUP__ADMIN_USERNAME=lemmy_beta
-      - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
-      - LEMMY_SETUP__SITE_NAME=lemmy-beta
-      - LEMMY_RATE_LIMIT__POST=99999
-      - LEMMY_RATE_LIMIT__REGISTER=99999
-      - LEMMY_CAPTCHA__ENABLED=false
-      - RUST_BACKTRACE=1
-      - RUST_LOG=debug
-    depends_on:
-      - postgres_beta
-    ports: 
-      - "8551:8551"
-  postgres_beta:
-    image: postgres:12-alpine
-    environment:
-      - POSTGRES_USER=lemmy
-      - POSTGRES_PASSWORD=password
-      - POSTGRES_DB=lemmy
-    volumes:
-      - ./volumes/postgres_beta:/var/lib/postgresql/data
-
-  lemmy-gamma:
-    image: dessalines/lemmy:travis
-    environment:
-      - LEMMY_HOSTNAME=lemmy-gamma:8561
-      - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_gamma:5432/lemmy
-      - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FEDERATION__ENABLED=true
-      - LEMMY_TLS_ENABLED=false
-      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-beta,lemmy-delta,lemmy-epsilon
-      - LEMMY_PORT=8561
-      - LEMMY_SETUP__ADMIN_USERNAME=lemmy_gamma
-      - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
-      - LEMMY_SETUP__SITE_NAME=lemmy-gamma
-      - LEMMY_RATE_LIMIT__POST=99999
-      - LEMMY_RATE_LIMIT__REGISTER=99999
-      - LEMMY_CAPTCHA__ENABLED=false
-      - RUST_BACKTRACE=1
-      - RUST_LOG=debug
-    depends_on:
-      - postgres_gamma
-    ports: 
-      - "8561:8561"
-  postgres_gamma:
-    image: postgres:12-alpine
-    environment:
-      - POSTGRES_USER=lemmy
-      - POSTGRES_PASSWORD=password
-      - POSTGRES_DB=lemmy
-    volumes:
-      - ./volumes/postgres_gamma:/var/lib/postgresql/data
-
-  # An instance with only an allowlist for beta
-  lemmy-delta:
-    image: dessalines/lemmy:travis
-    environment:
-      - LEMMY_HOSTNAME=lemmy-delta:8571
-      - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_delta:5432/lemmy
-      - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FEDERATION__ENABLED=true
-      - LEMMY_TLS_ENABLED=false
-      - LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta
-      - LEMMY_PORT=8571
-      - LEMMY_SETUP__ADMIN_USERNAME=lemmy_delta
-      - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
-      - LEMMY_SETUP__SITE_NAME=lemmy-delta
-      - LEMMY_RATE_LIMIT__POST=99999
-      - LEMMY_RATE_LIMIT__REGISTER=99999
-      - LEMMY_CAPTCHA__ENABLED=false
-      - RUST_BACKTRACE=1
-      - RUST_LOG=debug
-    depends_on:
-      - postgres_delta
-    ports: 
-      - "8571:8571"
-  postgres_delta:
-    image: postgres:12-alpine
-    environment:
-      - POSTGRES_USER=lemmy
-      - POSTGRES_PASSWORD=password
-      - POSTGRES_DB=lemmy
-    volumes:
-      - ./volumes/postgres_delta:/var/lib/postgresql/data
-
-  # An instance who has a blocklist, with lemmy-alpha blocked
-  lemmy-epsilon:
-    image: dessalines/lemmy:travis
-    environment:
-      - LEMMY_HOSTNAME=lemmy-epsilon:8581
-      - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_epsilon:5432/lemmy
-      - LEMMY_JWT_SECRET=changeme
-      - LEMMY_FEDERATION__ENABLED=true
-      - LEMMY_TLS_ENABLED=false
-      - LEMMY_FEDERATION__BLOCKED_INSTANCES=lemmy-alpha
-      - LEMMY_PORT=8581
-      - LEMMY_SETUP__ADMIN_USERNAME=lemmy_epsilon
-      - LEMMY_SETUP__ADMIN_PASSWORD=lemmy
-      - LEMMY_SETUP__SITE_NAME=lemmy-epsilon
-      - LEMMY_RATE_LIMIT__POST=99999
-      - LEMMY_RATE_LIMIT__REGISTER=99999
-      - LEMMY_CAPTCHA__ENABLED=false
-      - RUST_BACKTRACE=1
-      - RUST_LOG=debug
-    depends_on:
-      - postgres_epsilon
-    ports: 
-      - "8581:8581"
-  postgres_epsilon:
-    image: postgres:12-alpine
-    environment:
-      - POSTGRES_USER=lemmy
-      - POSTGRES_PASSWORD=password
-      - POSTGRES_DB=lemmy
-    volumes:
-      - ./volumes/postgres_epsilon:/var/lib/postgresql/data
--- a/docker/travis/docker_push.sh
+++ b/docker/travis/docker_push.sh
@ -1,5 +0,0 @@
-#!/bin/sh
-echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-docker tag dessalines/lemmy:travis \
-  dessalines/lemmy:0.9.0-rc.4
-docker push dessalines/lemmy:0.9.0-rc.4
--- a/docker/travis/run-tests.bash
+++ b/docker/travis/run-tests.bash
@ -1,28 +0,0 @@
-#!/bin/bash
-set -e
-
-# make sure there are no old containers or old data around
-sudo docker-compose down
-sudo rm -rf volumes
-
-mkdir -p volumes/pictrs_{alpha,beta,gamma,delta,epsilon}
-sudo chown -R 991:991 volumes/pictrs_{alpha,beta,gamma,delta,epsilon}
-
-sudo docker build ../../ --file ../prod/Dockerfile --tag dessalines/lemmy:travis
-
-sudo docker-compose up -d
-
-pushd ../../api_tests
-echo "Waiting for Lemmy to start..."
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8541/api/v1/site')" != "200" ]]; do sleep 1; done
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8551/api/v1/site')" != "200" ]]; do sleep 1; done
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8561/api/v1/site')" != "200" ]]; do sleep 1; done
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8571/api/v1/site')" != "200" ]]; do sleep 1; done
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8581/api/v1/site')" != "200" ]]; do sleep 1; done
-yarn
-yarn api-test
-popd
-
-sudo docker-compose down
-
-sudo rm -r volumes/