Merge pull request #3 from realk1ko/dev

realk1ko · web-flow · commit 7fbe764a7b64 · 2023-08-21T17:49:10.000+02:00
Adapted comment for version workaround and switched from ENTRYPOINT t…
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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:
diff --git a/Dockerfile b/Dockerfile
@@ -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" ]
diff --git a/README.md b/README.md
@@ -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`).
 

Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,4 @@ RUN set -euo pipefail && \`
`25`	`25`
`26`	`26`	`ENV COCKPIT_SSH_KEY_PATH /etc/cockpit/identity`
`27`	`27`
`28`		`-ENTRYPOINT [ "/usr/bin/supervisord", "-c", "/etc/supervisord.conf" ]`
	`28`	`+CMD [ "/usr/bin/supervisord", "-c", "/etc/supervisord.conf" ]`