Skip to content

Commit

Permalink
Merge pull request #3 from realk1ko/dev
Browse files Browse the repository at this point in the history
Adapted comment for version workaround and switched from ENTRYPOINT t…
  • Loading branch information
realk1ko authored Aug 21, 2023
2 parents 2dbdb1a + e7e4984 commit 7fbe764
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
username: ${{ secrets.username }}
password: ${{ secrets.token }}

# FIXME this is kind of hacky, but for some reason $GITHUB_OUTPUT and $GITHUB_ENV just don't work here
# FIXME see https://github.com/addnab/docker-run-action/issues/41
- name: Get Cockpit version (workaround)
uses: addnab/docker-run-action@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ RUN set -euo pipefail && \

ENV COCKPIT_SSH_KEY_PATH /etc/cockpit/identity

ENTRYPOINT [ "/usr/bin/supervisord", "-c", "/etc/supervisord.conf" ]
CMD [ "/usr/bin/supervisord", "-c", "/etc/supervisord.conf" ]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Cockpit Web Service (`cockpit-ws`).
The following tags are published to the GitHub Container Registry:

- `:latest`: This is the tag you should be using. is updated within a day of a new release of the Cockpit packages for
Fedora automatically. Additionally, each release is tagged with the installed Cockpit (e. g. `:280`).
Fedora automatically. Additionally, each release is tagged with the installed Cockpit version (e. g. `:280`).
- `:edge`: Latest build of the image on the latest commit on the `dev` branch. Each image tagged with this is also
tagged with the SHA commit reference it was built on (e. g. `:sha-bb8c5c4`).

Expand Down

0 comments on commit 7fbe764

Please sign in to comment.