Skip to content

Commit

Permalink
Merge pull request #73 from geoadmin/bug-pb-887-docker-build-failure
Browse files Browse the repository at this point in the history
PB 887 Fix dockerfile to use pipenv sync instead of install
  • Loading branch information
schtibe authored Aug 15, 2024
2 parents 5ee0e9a + 7d99349 commit ec5b061
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ RUN groupadd -r geoadmin && useradd -u 1000 -r -s /bin/false -g geoadmin geoadmi
RUN pip3 install pipenv \
&& pipenv --version

COPY Pipfile* /tmp/
RUN cd /tmp && \
pipenv install --system --deploy --ignore-pipfile
COPY Pipfile.lock /tmp/
RUN cd /tmp && pipenv sync

WORKDIR /app
COPY --chown=geoadmin:geoadmin ./ /app/
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ See also [Git Flow - Versioning](https://github.com/geoadmin/doc-guidelines/blob

### Make Dependencies

The **Make** targets assume you have **python3.11**, **pipenv**, **bash**, **curl**, **tar**, **docker** and **docker-compose** installed.
The **Make** targets assume you have **python3.11**, **pipenv**, **bash**, **curl**, **tar**, **docker** and **docker-compose-plugin** installed.

### Setting up to work

Expand Down Expand Up @@ -75,7 +75,7 @@ The other services that are used (DynamoDB local and [MinIO](https://www.min.io)
Starting DynamoDB local and MinIO is done with a simple

```bash
docker-compose up
docker compose up
```

in the source root folder. Make sure to run `make dev` before to ensure the necessary folders `.volumes/*` are in place. These folders are mounted in the services and allow data persistency over restarts of the containers.
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.4"
services:
s3:
image: minio/minio
Expand Down

0 comments on commit ec5b061

Please sign in to comment.