diff --git a/bin/dlc b/bin/dlc index 3fc05df0..c3b1832b 100755 --- a/bin/dlc +++ b/bin/dlc @@ -21,7 +21,7 @@ fi echo "Running docker compose up" -docker compose up --exit-code-from dlc +docker compose -f 'docker/bind_mount/docker-compose.yml' up --exit-code-from dlc container_id=$(docker ps -aqf "name=dlc") exit_code=$(docker inspect $container_id --format='{{.State.ExitCode}}') diff --git a/Dockerfile b/docker/bind_mount/Dockerfile similarity index 93% rename from Dockerfile rename to docker/bind_mount/Dockerfile index 32e94ce4..d225cad2 100644 --- a/Dockerfile +++ b/docker/bind_mount/Dockerfile @@ -11,14 +11,14 @@ RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \ ENV RAILS_ENV=development \ NODE_ENV=development +WORKDIR /app + COPY . /app -COPY entrypoint.sh /usr/bin/ +COPY docker/bind_mount/entrypoint.sh /usr/bin/ RUN chmod +x /usr/bin/entrypoint.sh -WORKDIR /app - RUN bundle install RUN yarn install --ignore-engines diff --git a/docker-compose.yml b/docker/bind_mount/docker-compose.yml similarity index 66% rename from docker-compose.yml rename to docker/bind_mount/docker-compose.yml index 91bc945f..a2d4f409 100644 --- a/docker-compose.yml +++ b/docker/bind_mount/docker-compose.yml @@ -4,12 +4,13 @@ version: '3.8' services: dlc: build: - context: . + context: ../../. + dockerfile: docker/bind_mount/Dockerfile ports: - "3000:3000" # Rails server - "3035:3035" # Shakapacker dev server volumes: - - .:/app # Bind-mount the project folder to /app inside the container + - ../../.:/app # Bind-mount the project folder to /app inside the container extra_hosts: - "host.docker.internal:host-gateway" environment: diff --git a/entrypoint.sh b/docker/bind_mount/entrypoint.sh similarity index 100% rename from entrypoint.sh rename to docker/bind_mount/entrypoint.sh