From 8015f560d6cc58fa681c04938633095999900816 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 2 Sep 2020 15:41:49 -0500 Subject: [PATCH] Adding in a more reliable docker dev build. (The other wouldn't use buildkit). --- docker/dev/docker-compose.yml | 4 +--- docker/dev/docker_update.sh | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 41902fe3..bd303bc8 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -3,9 +3,7 @@ version: '3.3' services: lemmy: - build: - context: ../../ - dockerfile: docker/dev/Dockerfile + image: lemmy-dev:latest ports: - "8536:8536" restart: always diff --git a/docker/dev/docker_update.sh b/docker/dev/docker_update.sh index 26de36c8..7cf5f5db 100755 --- a/docker/dev/docker_update.sh +++ b/docker/dev/docker_update.sh @@ -1,7 +1,6 @@ #!/bin/sh set -e -export COMPOSE_DOCKER_CLI_BUILD=1 -export DOCKER_BUILDKIT=1 sudo chown -R 991:991 volumes/pictrs -sudo docker-compose up -d --no-deps --build +sudo docker build ../../ --file ../dev/Dockerfile -t lemmy-dev:latest +sudo docker-compose up -d -- 2.44.1