From c9e1cbb5428158d31ec34057be612fbe659f48b5 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Mon, 4 Nov 2019 11:51:36 -0500 Subject: [PATCH 1/4] allow building locally as well as with docker If docker uses the .rustwide directory, it will only be readable and writable by root. This uses a different scratch directory so that the .rustwide directory can be used for local builds. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e9562b5ab..a3187a6a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: - "3000:3000" volumes: - "/var/run/docker.sock:/var/run/docker.sock" - - ".rustwide:/home/cratesfyi/rustwide" + - ".rustwide-docker:/home/cratesfyi/rustwide" - "cratesio-index:/opt/docsrs/prefix/crates.io-index" environment: CRATESFYI_RUSTWIDE_WORKSPACE: /home/cratesfyi/rustwide From 4c0a1cea20d00569f3205939d900776e071afa82 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Mon, 4 Nov 2019 12:01:33 -0500 Subject: [PATCH 2/4] ignore rustwide-docker directory --- .dockerignore | 1 + .gitignore | 1 + 2 files changed, 2 insertions(+) diff --git a/.dockerignore b/.dockerignore index 4c9a2b70c..b96afe2a7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,4 @@ /.rustwide +/.rustwide-docker /ignored **/target diff --git a/.gitignore b/.gitignore index 9724e40b8..bc25d91cd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ target .sass-cache .vagrant .rustwide +.rustwide-docker From 8544ced90ece65065464e1af95a8d928130da510 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Mon, 4 Nov 2019 15:11:31 -0500 Subject: [PATCH 3/4] run entrypoint in bash, not sh ((a=a+1)) is not defined in posix sh --- docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index c2ba355fa..14105ff86 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash set -euv From 28fcc5fc774412bd99a6701726566d8ff773565f Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Mon, 4 Nov 2019 15:20:08 -0500 Subject: [PATCH 4/4] use /opt/docsrs instead of /home/cratesfyi --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a3187a6a0..15424be09 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,10 +8,10 @@ services: - "3000:3000" volumes: - "/var/run/docker.sock:/var/run/docker.sock" - - ".rustwide-docker:/home/cratesfyi/rustwide" + - ".rustwide-docker:/opt/docsrs/rustwide" - "cratesio-index:/opt/docsrs/prefix/crates.io-index" environment: - CRATESFYI_RUSTWIDE_WORKSPACE: /home/cratesfyi/rustwide + CRATESFYI_RUSTWIDE_WORKSPACE: /opt/docsrs/rustwide CRATESFYI_DATABASE_URL: postgresql://cratesfyi:password@db env_file: - .env