Skip to content

Commit

Permalink
dokku: get buildpack deployment back
Browse files Browse the repository at this point in the history
Dokku normally defaults to using heroku buildpacks for deployment, but
this may be overridden by committing a valid Dockerfile to the root of
the repository and pushing the repository to the Dokku installation.

Commit 161e556 ("docker: add `Dockerfile` to build Docker images") just
added such a Dockerfile and accidentally switched the deployment to the
`Dockerfile` mode. Due to this fact, Dokku `apt` plugin on the server
started to ignore the ./apt-packages file with a needed dependency for
the app as it works with buildpack-based applications only. So we had
a wrong deployment on the server.

The solution is simple, just move ./Dockerfile to the ./docker dir.

Also, move the ./test dir to ./docker for consistency.
  • Loading branch information
ylobankov committed Apr 26, 2024
1 parent 1a9036a commit 681fc45
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
uses: actions/checkout@v4

- name: Build docker image
run: docker build --tag rws --no-cache .
run: docker build --tag rws --no-cache --file docker/Dockerfile .

- name: Run app in docker container
run: |
Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ python3 -c "from werkzeug.security import generate_password_hash; print(generate
For running RWS via Docker, just create an image and run a container from it.

```bash
docker build -t rws .
docker build -t rws -f docker/Dockerfile .
docker run \
-e RWS_CFG=/app/config.default \
-e RWS_CREDENTIALS='{"user": "password"}' \
Expand All @@ -206,12 +206,14 @@ docker run \
rws
```

## Test stand
### Test stand

Note, that a Docker image with tag `rws` must be build first.

For setting up a test stand, `docker-compose` can be used:

```bash
docker-compose -f test/docker-compose.yml up
docker-compose -f docker/test/docker-compose.yml up
```

It will run RWS and MinIO (S3 storage) in the separate Docker containers.
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 681fc45

Please sign in to comment.