Merge pull request #24 from doubleangels/master

Update build process and base image to Alpine 3.19
master
Heiner 2024-03-14 06:22:22 +01:00 zatwierdzone przez GitHub
commit bbf3dca7b1
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
2 zmienionych plików z 10 dodań i 10 usunięć

Wyświetl plik

@ -10,13 +10,13 @@ jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v1 uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1 uses: docker/setup-buildx-action@v3
- name: Cache Docker layers - name: Cache Docker layers
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
path: /tmp/.buildx-cache path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }} key: ${{ runner.os }}-buildx-${{ github.sha }}
@ -24,13 +24,13 @@ jobs:
${{ runner.os }}-buildx- ${{ runner.os }}-buildx-
- name: Log into registry - name: Log into registry
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
uses: docker/login-action@v1 uses: docker/login-action@v3
with: with:
registry: docker.io registry: docker.io
username: virtualzone username: virtualzone
password: ${{ secrets.CI_REGISTRY_PASSWORD }} password: ${{ secrets.CI_REGISTRY_PASSWORD }}
- name: Build and push - name: Build and push
uses: docker/build-push-action@v2 uses: docker/build-push-action@v5
with: with:
context: . context: .
platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
@ -40,9 +40,9 @@ jobs:
cache-from: type=local,src=/tmp/.buildx-cache cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new cache-to: type=local,dest=/tmp/.buildx-cache-new
- name: Docker Hub Description - name: Docker Hub Description
uses: peter-evans/dockerhub-description@v2 uses: peter-evans/dockerhub-description@v4
with: with:
username: virtualzone username: virtualzone
password: ${{ secrets.CI_REGISTRY_PASSWORD }} password: ${{ secrets.CI_REGISTRY_PASSWORD }}
repository: virtualzone/docker-container-stats repository: virtualzone/docker-container-stats
readme-filepath: ./README.md readme-filepath: ./README.md

Wyświetl plik

@ -1,4 +1,4 @@
FROM alpine:3.17 FROM alpine:3.19
ARG BUILD_DATE ARG BUILD_DATE
ARG VCS_REF ARG VCS_REF
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
@ -29,4 +29,4 @@ ADD html/ /opt/docker-stats/html/
ADD supervisord.conf /etc/supervisord.conf ADD supervisord.conf /etc/supervisord.conf
EXPOSE 8080 EXPOSE 8080
CMD ["/usr/bin/supervisord"] CMD ["/usr/bin/supervisord"]