From 5c0a49c815e3d6dc560e7d1514f598511fcc3579 Mon Sep 17 00:00:00 2001 From: bipface Date: Wed, 3 Feb 2021 00:21:08 +1100 Subject: [PATCH 1/2] fix filename in docker-compose command --- config/docker/docker-compose.test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/docker/docker-compose.test.yaml b/config/docker/docker-compose.test.yaml index ffcbff7fa..1a14ce0f1 100644 --- a/config/docker/docker-compose.test.yaml +++ b/config/docker/docker-compose.test.yaml @@ -1,5 +1,5 @@ # -# Usage: docker-compose --env-file .env.test -f config/docker/docker-compose-test.yaml -p danbooru run -T danbooru +# Usage: docker-compose --env-file .env.test -f config/docker/docker-compose.test.yaml -p danbooru run -T danbooru # # Docker Compose file to create an instance of danbooru along with a test database and run the test suite. # From 7546198fcc380e749292883679946e3c2fb88413 Mon Sep 17 00:00:00 2001 From: bipface Date: Wed, 3 Feb 2021 00:25:59 +1100 Subject: [PATCH 2/2] fix Dockerfile.danbooru bundle path was getting lost when switching user --- config/docker/Dockerfile.danbooru | 1 + 1 file changed, 1 insertion(+) diff --git a/config/docker/Dockerfile.danbooru b/config/docker/Dockerfile.danbooru index 013644a89..dc9d7c61e 100644 --- a/config/docker/Dockerfile.danbooru +++ b/config/docker/Dockerfile.danbooru @@ -32,6 +32,7 @@ COPY package.json yarn.lock ./ RUN yarn install COPY . . +RUN bundle config set path vendor/bundle --local ARG DATABASE_URL=postgresql://0.0.0.0 ARG DANBOORU_SECRET_KEY_BASE=1234