diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 7e09363..df07e41 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -12,7 +12,7 @@ on: jobs: # ---------------------------------------- - # 1. Check if .docker/Dockerfile or .github/workflows/docker.yaml changed + # 1. Check if docker/Dockerfile or .github/workflows/docker.yaml changed # ---------------------------------------- check-dockerfile-changes: runs-on: ubuntu-latest @@ -28,7 +28,7 @@ jobs: with: filters: | dockerfile: - - '.docker/Dockerfile' + - 'docker/Dockerfile' dockerbuild_workflow: - '.github/workflows/docker.yaml' # -------------------------------- @@ -53,7 +53,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . - file: .docker/Dockerfile + file: docker/Dockerfile # no pushing here, so we can test locally push: false # load the built image into the local Docker daemon on the runner @@ -172,7 +172,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . - file: .docker/Dockerfile + file: docker/Dockerfile push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} @@ -221,7 +221,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . - file: .docker/Dockerfile + file: docker/Dockerfile push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.docker/Dockerfile b/docker/Dockerfile similarity index 100% rename from .docker/Dockerfile rename to docker/Dockerfile diff --git a/.docker/USAGE.md b/docker/USAGE.md similarity index 97% rename from .docker/USAGE.md rename to docker/USAGE.md index 8999051..5be4409 100644 --- a/.docker/USAGE.md +++ b/docker/USAGE.md @@ -193,11 +193,11 @@ cd rosenpass Build the rp image from the root of the repository as follows: ``` -docker build -f .docker/Dockerfile -t ghcr.io/rosenpass/rp --target rp . +docker build -f docker/Dockerfile -t ghcr.io/rosenpass/rp --target rp . ``` Build the rosenpass image from the root of the repostiry with the following command: ``` -docker build -f .docker/Dockerfile -t ghcr.io/rosenpass/rosenpass --target rosenpass . +docker build -f docker/Dockerfile -t ghcr.io/rosenpass/rosenpass --target rosenpass . ``` diff --git a/readme.md b/readme.md index bfaf7ff..aa4c881 100644 --- a/readme.md +++ b/readme.md @@ -85,7 +85,7 @@ Rosenpass is also available as prebuilt Docker images: - [`ghcr.io/rosenpass/rosenpass`](https://github.com/rosenpass/rosenpass/pkgs/container/rosenpass) - [`ghcr.io/rosenpass/rp`](https://github.com/rosenpass/rosenpass/pkgs/container/rp) -For details on how to use these images, refer to the [Docker usage guide](.docker/USAGE.md). +For details on how to use these images, refer to the [Docker usage guide](docker/USAGE.md). # Mirrors