From 7fc8b8c553bde3e977aad626fa73eff3523970a2 Mon Sep 17 00:00:00 2001 From: Chris Henning <2653277+chennin@users.noreply.github.com> Date: Fri, 15 Nov 2024 09:45:51 -0500 Subject: [PATCH] Update ENV syntax, start pinning actions --- .github/workflows/docker-publish.yml | 12 ++++++------ alpine/Dockerfile | 8 ++++---- debian/Dockerfile | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 3811a31..6dfd4ee 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -37,7 +37,7 @@ jobs: steps: # Build the latest tag and master if no branch is provided - id: upstream - uses: oprypin/find-latest-tag@v1 + uses: oprypin/find-latest-tag@dd2729fe78b0bb55523ae2b2a310c6773a652bd1 # v1.1.2 with: repository: eliasdoehne/stellaris-dashboard releases-only: true @@ -84,12 +84,12 @@ jobs: steps: # https://github.com/docker/setup-buildx-action - name: Setup Docker buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@885d1462b80bc1c1c7f0b00334ad271f09369c55 #v2.10.0 # Login against a Docker registry except on PR # https://github.com/docker/login-action - name: Log into registry ${{ env.REGISTRY }} - uses: docker/login-action@v2 + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 with: registry: ${{ env.REGISTRY }} username: ${{ secrets.DOCKER_USER }} @@ -97,7 +97,7 @@ jobs: # https://github.com/actions/checkout - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - id: tag run: | @@ -114,7 +114,7 @@ jobs: # https://github.com/docker/build-push-action - name: Build Docker image id: build - uses: docker/build-push-action@v3 + uses: docker/build-push-action@1104d471370f9806843c095c1db02b5a90c5f8b6 # v3.3.1 with: context: . load: true @@ -134,7 +134,7 @@ jobs: docker run --rm ${{ join(steps.tag.outputs.tag, '-test') }} sh -c 'git submodule update --init --recursive; python -m pytest -m "not skip_github_actions"' - name: Push Docker image id: push - uses: docker/build-push-action@v3 + uses: docker/build-push-action@1104d471370f9806843c095c1db02b5a90c5f8b6 # v3.3.1 with: context: . file: ${{ inputs.osname }}/Dockerfile diff --git a/alpine/Dockerfile b/alpine/Dockerfile index ac1d989..648edbe 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -14,10 +14,10 @@ RUN adduser --disabled-password stellaris USER stellaris WORKDIR /home/stellaris -ENV PATH "/home/stellaris/.local/bin:$PATH" -ENV CFLAGS "-O3 -fstack-protector-strong -march=x86-64 -Wl,--strip-all -g0 -DNDEBUG" -ENV CXXFLAGS "$CFLAGS" -ENV LDFLAGS "$CFLAGS" +ENV PATH="/home/stellaris/.local/bin:$PATH" +ENV CFLAGS="-O3 -fstack-protector-strong -march=x86-64 -Wl,--strip-all -g0 -DNDEBUG" +ENV CXXFLAGS="$CFLAGS" +ENV LDFLAGS="$CFLAGS" RUN mkdir -p "/home/stellaris/.local/share/Paradox Interactive/Stellaris/save games" "/home/stellaris/.steam/steamapps/common/Stellaris/localisation/english" RUN if [ "${SD_TAG}" = "master" ]; then \ diff --git a/debian/Dockerfile b/debian/Dockerfile index fec29cd..eff8c87 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -17,7 +17,7 @@ RUN useradd --create-home --shell /bin/bash stellaris USER stellaris WORKDIR /home/stellaris -ENV PATH "/home/stellaris/.local/bin:$PATH" +ENV PATH="/home/stellaris/.local/bin:$PATH" RUN mkdir -p "/home/stellaris/.local/share/Paradox Interactive/Stellaris/save games" "/home/stellaris/.steam/steamapps/common/Stellaris/localisation/english" RUN if [ "${SD_TAG}" = "master" ]; then \