Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .docker/scripts/proxy-coordinator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if [ -z "$project" ]; then
fi

if [ -z "${PROJECT_DIR:-}" ]; then
echo 'The host project directory was not provided to the coordinator.' >&2
echo 'The project directory was not provided to the coordinator.' >&2
exit 1
fi

Expand All @@ -42,7 +42,6 @@ proxy_compose() {

container_for_published_port() {
port="$1"

docker ps \
--filter "publish=$port" \
--format '{{.ID}}\t{{.Names}}\t{{.Image}}\t{{.Label "coop.librecode.dev-proxy"}}'
Expand Down Expand Up @@ -207,14 +206,15 @@ report_environment_ready() {
}

install_proxy_assets() {
docker run --rm \
docker run --rm -i \
-v librecode-dev-proxy-conf:/conf \
alpine sh -c 'cat > /conf/librecode-localhost.conf' \
< "$PROJECT_DIR/.docker/nginx-proxy/localhost.conf"

docker run --rm -i \
-v librecode-dev-proxy-html:/html \
-v "$PROJECT_DIR/.docker/nginx-proxy:/source:ro" \
alpine sh -c '
cp /source/localhost.conf /conf/librecode-localhost.conf
cp /source/index.html /html/index.html
'
alpine sh -c 'cat > /html/index.html' \
< "$PROJECT_DIR/.docker/nginx-proxy/index.html"
}

success() {
Expand Down Expand Up @@ -251,4 +251,4 @@ if ! report_environment_ready; then
echo 'Could not print environment banner.' >&2
fi

success "$proxy_state"
success "$proxy_state"
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ services:
dockerfile: Dockerfile.proxy-coordinator
volumes:
- ${DOCKER_SOCKET:-/var/run/docker.sock}:/var/run/docker.sock
- .:${PWD}:ro
working_dir: ${PWD}
- .:/project:ro
working_dir: /project
environment:
- PROJECT_DIR=${PWD}
- PROJECT_DIR=/project
- NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER:-admin}
- NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD:-admin}
- VERSION_NEXTCLOUD=${VERSION_NEXTCLOUD:-master}
Expand Down