Skip to content

Commit 221848f

Browse files
committed
2025-10-27
1 parent 3b68471 commit 221848f

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

.github/workflows/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ jobs:
2828
id: test
2929
shell: 'script -q -e -c "bash {0}"'
3030
run: |
31-
docker run -d --name=${{ env.DEMYX_REPOSITORY }} --entrypoint=top demyx/${{ env.DEMYX_REPOSITORY }}
31+
docker run -d --name=${{ env.DEMYX_REPOSITORY }} demyx/${{ env.DEMYX_REPOSITORY }}
3232
33-
DEMYX_TEST="$(docker exec ${{ env.DEMYX_REPOSITORY }} haproxy -v 2>&1)"
34-
if [[ "$DEMYX_TEST" == *"HAProxy version"* ]]; then
33+
DEMYX_TEST="$(docker exec ${{ env.DEMYX_REPOSITORY }} cat /usr/local/etc/haproxy/haproxy.cfg)"
34+
if [[ "$DEMYX_TEST" == *"bind :2375"* ]]; then
3535
echo "$DEMYX_TEST"
3636
else
3737
exit 1
3838
fi
3939
- name: Version
4040
run: |
41-
DEMYX_DOCKER_SOCKET_PROXY_ALPINE_VERSION="$(docker exec --user=root ${{ env.DEMYX_REPOSITORY }} cat /etc/os-release | grep VERSION_ID | cut -c 12-)"
42-
DEMYX_DOCKER_SOCKET_PROXY_HAPROXY_VERSION="$(docker exec --user=root ${{ env.DEMYX_REPOSITORY }} haproxy -v | grep HA-Proxy | awk '{print $3}')"
41+
DEMYX_DOCKER_SOCKET_PROXY_ALPINE_VERSION="$(docker exec ${{ env.DEMYX_REPOSITORY }} cat /etc/os-release | grep VERSION_ID | cut -c 12-)"
42+
DEMYX_DOCKER_SOCKET_PROXY_HAPROXY_VERSION="$(docker exec ${{ env.DEMYX_REPOSITORY }} haproxy -v | grep HA-Proxy | awk '{print $3}')"
4343
DEMYX_JQ="$(jq ".alpine = \"$DEMYX_DOCKER_SOCKET_PROXY_ALPINE_VERSION\" | .docker_socket_proxy = \"$DEMYX_DOCKER_SOCKET_PROXY_HAPROXY_VERSION\"" version.json)"
4444
4545
# Update versions

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# CHANGELOG
22

3+
## 2025-10-27
4+
- fix: upstream changes [3b68471](https://github.com/demyxsh/docker-socket-proxy/commit/3b68471f4eeac7bdda9aa5319bb8a514eda7749e)
5+
36
## 2025-10-21
47
- fix: update test conditional [eb8e7cc](https://github.com/demyxsh/docker-socket-proxy/commit/eb8e7cc0fc52f34f5069c4ff56a8e355e7457bf3)
58

0 commit comments

Comments
 (0)