diff options
| author | Dessalines <tyhou13@gmx.com> | 2020-07-01 09:04:26 -0400 |
|---|---|---|
| committer | Dessalines <tyhou13@gmx.com> | 2020-07-01 09:04:26 -0400 |
| commit | cd007febef64b980ddfeed157d097f0d23d452a4 (patch) | |
| tree | 3af2cda843437b1b4285689b1934f2512735c7f8 /docker | |
| parent | a074564458b8a108b77d98e5e8ce24168656763a (diff) | |
| parent | 5c03e9e9ee53639c93e63253d99998a85b282ab8 (diff) | |
Merge branch 'master' into federation
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/dev/docker-compose.yml | 2 | ||||
| -rwxr-xr-x | docker/dev/test_deploy.sh | 4 | ||||
| -rw-r--r-- | docker/federation/docker-compose.yml | 2 | ||||
| -rw-r--r-- | docker/prod/docker-compose.yml | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 51a3ecda..fc6e2105 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -40,7 +40,7 @@ services: restart: always iframely: - image: dogbin/iframely:latest + image: jolt/iframely:v1.4.3 ports: - "127.0.0.1:8061:80" volumes: diff --git a/docker/dev/test_deploy.sh b/docker/dev/test_deploy.sh index c2ecc0c8..7641c940 100755 --- a/docker/dev/test_deploy.sh +++ b/docker/dev/test_deploy.sh @@ -9,10 +9,10 @@ export COMPOSE_DOCKER_CLI_BUILD=1 export DOCKER_BUILDKIT=1 # Rebuilding dev docker -sudo docker build . -f "docker/dev/Dockerfile" -t "dessalines/lemmy:$BRANCH" +sudo docker build ../../ -f . -t "dessalines/lemmy:$BRANCH" sudo docker push "dessalines/lemmy:$BRANCH" # Run the playbook -pushd ../lemmy-ansible +pushd ../../../lemmy-ansible ansible-playbook -i test playbooks/site.yml popd diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index cbc648e6..51a37b91 100644 --- a/docker/federation/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -107,6 +107,6 @@ services: - ./volumes/postgres_gamma:/var/lib/postgresql/data iframely: - image: dogbin/iframely:latest + image: jolt/iframely:v1.4.3 volumes: - ../iframely.config.local.js:/iframely/config.local.js:ro diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index ef3d6975..cd364a3c 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.7.2 + image: dessalines/lemmy:v0.7.6 ports: - "127.0.0.1:8536:8536" restart: always @@ -35,7 +35,7 @@ services: restart: always iframely: - image: dogbin/iframely:latest + image: jolt/iframely:v1.4.3 ports: - "127.0.0.1:8061:80" volumes: |