Compare commits

..

4 Commits

Author SHA1 Message Date
dependabot[bot] 544382d5d6 build(deps): bump the updates group with 4 updates (#4083) 2026-05-27 07:18:24 -05:00
dependabot[bot] e59cf8ac55 build(deps): bump the patches group across 1 directory with 2 updates (#4073)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-05-27 07:04:47 -05:00
renovate[bot] 68830d5a9f Update dependency itzg/mc-monitor to v0.16.6 (#4082) 2026-05-26 17:51:10 -05:00
Geoff Bourne 14356b7662 Corrected the setting of MC_IMAGE_HELPER_OPTS from PROXY_* vars (#4081) 2026-05-26 11:39:58 -05:00
5 changed files with 14 additions and 13 deletions
+6 -6
View File
@@ -111,7 +111,7 @@ jobs:
- name: Docker meta
id: meta
uses: docker/metadata-action@v6.0.0
uses: docker/metadata-action@v6.1.0
with:
# NOTE for forks: if your Docker Hub organization doesn't match your Github repo's,
# then the use of ${{ github.repository_owner }} will need to be replaced.
@@ -141,13 +141,13 @@ jobs:
org.opencontainers.image.authors=Geoff Bourne <itzgeoff@gmail.com>
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v4.0.0
uses: docker/setup-buildx-action@v4.1.0
- name: Set up QEMU
uses: docker/setup-qemu-action@v4.0.0
- name: Build for test
uses: docker/build-push-action@v7.1.0
uses: docker/build-push-action@v7.2.0
with:
platforms: linux/amd64
tags: ${{ env.IMAGE_TO_TEST }}
@@ -172,14 +172,14 @@ jobs:
tests/test.sh
- name: Login to DockerHub
uses: docker/login-action@v4.1.0
uses: docker/login-action@v4.2.0
if: env.HAS_IMAGE_REPO_ACCESS
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Login to GHCR
uses: docker/login-action@v4.1.0
uses: docker/login-action@v4.2.0
if: env.HAS_IMAGE_REPO_ACCESS
with:
registry: ghcr.io
@@ -187,7 +187,7 @@ jobs:
password: ${{ github.token }}
- name: Build and push
uses: docker/build-push-action@v7.1.0
uses: docker/build-push-action@v7.2.0
if: github.actor == github.repository_owner
with:
platforms: ${{ matrix.platforms }}
+3 -3
View File
@@ -59,10 +59,10 @@ jobs:
fetch-depth: 0
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v4.0.0
uses: docker/setup-buildx-action@v4.1.0
- name: Confirm multi-arch build
uses: docker/build-push-action@v7.1.0
uses: docker/build-push-action@v7.2.0
with:
platforms: ${{ matrix.platforms }}
# ensure latest base image is used
@@ -73,7 +73,7 @@ jobs:
cache-from: type=gha,scope=${{ matrix.variant }}
- name: Build for test
uses: docker/build-push-action@v7.1.0
uses: docker/build-push-action@v7.2.0
with:
# Only build single platform since loading multi-arch image into daemon fails with
# "docker exporter does not currently support exporting manifest lists"
+1 -1
View File
@@ -43,7 +43,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
--from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
# renovate: datasource=github-releases packageName=itzg/mc-monitor
ARG MC_MONITOR_VERSION=0.16.5
ARG MC_MONITOR_VERSION=0.16.6
RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
--var version=${MC_MONITOR_VERSION} --var app=mc-monitor --file {{.app}} \
--from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
+2 -2
View File
@@ -1,4 +1,4 @@
click==8.3.3
click==8.4.1
colorama==0.4.6
deepmerge==2.0
ghp-import==2.1.0
@@ -22,4 +22,4 @@ PyYAML==6.0.3
pyyaml_env_tag==1.1
six==1.17.0
watchdog==6.0.0
zensical==0.0.41
zensical==0.0.43
+2 -1
View File
@@ -123,7 +123,8 @@ function addToProxyArgs() {
addToProxyArgs http.proxyHost "${PROXY_HOST:-}"
addToProxyArgs http.proxyPort "${PROXY_PORT:-}"
addToProxyArgs http.nonProxyHosts "${PROXY_NON_PROXY_HOSTS:-}"
export MC_IMAGE_HELPER_OPTS+=" ${proxyArgs[*]}"
LOCAL_IFS=$IFS; IFS=' '; MC_IMAGE_HELPER_OPTS+=" ${proxyArgs[*]}"; IFS=$LOCAL_IFS
export MC_IMAGE_HELPER_OPTS
function fixJavaPath() {
# Some Docker management UIs grab all the image declared variables and present them for configuration.