Skip to content

Commit 99850ed

Browse files
authored
Upgrade Alpine and package versions, increase app version (#34)
* Upgrade Alpine and package versions, increase app version * Upgrade Actions * Upgrade Actions * Upgrade github_workflows
1 parent a81fe83 commit 99850ed

9 files changed

+30
-30
lines changed

.github/workflows/build-and-push-container-image.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
!contains(github.event.pull_request.labels.*.name, 'chore')
2020
steps:
2121
- name: Checkout GIT repository
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323
- name: Get the application version
2424
id: application-version
2525
run: |
@@ -30,16 +30,16 @@ jobs:
3030
fi
3131
echo "tag=${image_version}" >> $GITHUB_OUTPUT
3232
- name: Set up QEMU
33-
uses: docker/setup-qemu-action@v2
33+
uses: docker/setup-qemu-action@v3
3434
- name: Set up Docker Buildx
35-
uses: docker/setup-buildx-action@v2
35+
uses: docker/setup-buildx-action@v3
3636
- name: Login to container registry
3737
uses: docker/login-action@v2
3838
with:
3939
username: ${{ secrets.DOCKERHUB_USERNAME }}
4040
password: ${{ secrets.DOCKERHUB_PASSWORD }}
4141
- name: Build and push
42-
uses: docker/build-push-action@v4
42+
uses: docker/build-push-action@v5
4343
with:
4444
push: true
4545
context: .

.github/workflows/container-image-build-validation.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,29 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout GIT repository
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
- name: Set up QEMU
17-
uses: docker/setup-qemu-action@v2
17+
uses: docker/setup-qemu-action@v3
1818
- name: Set up Docker Buildx
19-
uses: docker/setup-buildx-action@v2
19+
uses: docker/setup-buildx-action@v3
2020
- name: Test build
21-
uses: docker/build-push-action@v4.1.0
21+
uses: docker/build-push-action@v5
2222
with:
2323
push: false
2424
load: false
2525
context: .
2626
platforms: linux/amd64, linux/arm64
2727
tags: container-build:test
2828
- name: Test build and export for further validation
29-
uses: docker/build-push-action@v4.1.0
29+
uses: docker/build-push-action@v5
3030
with:
3131
push: false
3232
load: true
3333
context: .
3434
tags: container-build:test
3535
outputs: type=docker,dest=/tmp/container.tar
3636
- name: Upload container image as artifact
37-
uses: actions/upload-artifact@v3.1.2
37+
uses: actions/upload-artifact@v4
3838
with:
3939
name: container-build
4040
path: /tmp/container.tar
@@ -44,11 +44,11 @@ jobs:
4444
runs-on: ubuntu-latest
4545
steps:
4646
- name: Checkout GIT repository
47-
uses: actions/checkout@v3
47+
uses: actions/checkout@v4
4848
- name: Log in to Github container registry
4949
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
5050
- name: Build container for functionality test
51-
uses: docker/build-push-action@v4.1.0
51+
uses: docker/build-push-action@v5
5252
with:
5353
push: true
5454
load: false
@@ -191,7 +191,7 @@ jobs:
191191
scan:
192192
name: Container vulnerability scan
193193
needs: container-build
194-
uses: cybcon/github_workflows/.github/workflows/container-vulnerability-scan.yaml@v1.1.10
194+
uses: cybcon/github_workflows/.github/workflows/container-vulnerability-scan.yaml@v1.3.0
195195
with:
196196
image_name: container-build:test
197197
image_artifact_filename: container.tar

.github/workflows/pre-commit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ on:
66
- main
77
jobs:
88
pre-commit:
9-
uses: cybcon/github_workflows/.github/workflows/pre-commit.yaml@v1.1.10
9+
uses: cybcon/github_workflows/.github/workflows/pre-commit.yaml@v1.3.0

.github/workflows/release-from-label.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ on:
55
- closed
66
jobs:
77
release:
8-
uses: cybcon/github_workflows/.github/workflows/release-from-label.yaml@v1.1.10
8+
uses: cybcon/github_workflows/.github/workflows/release-from-label.yaml@v1.3.0

.github/workflows/release-label-validation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ on:
1010
- unlabeled
1111
jobs:
1212
release-label-validation:
13-
uses: cybcon/github_workflows/.github/workflows/release-label-validation.yaml@v1.1.10
13+
uses: cybcon/github_workflows/.github/workflows/release-label-validation.yaml@v1.3.0

.github/workflows/test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
python-version: ["3.9", "3.10", "3.11"]
1515

1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- name: Set up Python ${{ matrix.python-version }}
19-
uses: actions/setup-python@v4
19+
uses: actions/setup-python@v5
2020
with:
2121
python-version: ${{ matrix.python-version }}
2222
- name: Install dependencies

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
FROM alpine:3.18.5
1+
FROM alpine:3.19.1
22

33
LABEL maintainer="Michael Oberdorf IT-Consulting <info@oberdorf-itc.de>"
4-
LABEL site.local.program.version="1.3.0"
4+
LABEL site.local.program.version="1.3.1"
55

66
RUN apk upgrade --available --no-cache --update \
77
&& apk add --no-cache --update \
8-
python3=3.11.6-r0 \
9-
py3-pip=23.1.2-r0 \
8+
python3=3.11.8-r0 \
9+
py3-pip=23.3.1-r0 \
1010
# Cleanup APK
1111
&& rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
1212

1313
COPY --chown=root:root /src /
1414

15-
RUN pip3 install --no-cache-dir -r /requirements.txt
15+
RUN pip3 install --no-cache-dir -r /requirements.txt --break-system-packages
1616

1717
EXPOSE 5020/tcp
1818

Dockerfile.test

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
FROM alpine:3.18.5
1+
FROM alpine:3.19.1
22

33
LABEL maintainer="Michael Oberdorf IT-Consulting <info@oberdorf-itc.de>"
4-
LABEL site.local.program.version="1.3.0"
4+
LABEL site.local.program.version="1.3.1"
55

66
RUN apk upgrade --available --no-cache --update \
77
&& apk add --no-cache --update \
8-
python3=3.11.6-r0 \
9-
py3-pip=23.1.2-r0 \
8+
python3=3.11.8-r0 \
9+
py3-pip=23.3.1-r0 \
1010
# Cleanup APK
1111
&& rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
1212

1313
COPY --chown=root:root /src /
1414
COPY --chown=root:root /examples/test.json /test.json
1515

16-
RUN pip3 install --no-cache-dir -r /requirements.txt
16+
RUN pip3 install --no-cache-dir -r /requirements.txt --break-system-packages
1717

1818
EXPOSE 5020/tcp
1919

src/app/modbus_server.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Author: Michael Oberdorf IT-Consulting
55
Datum: 2020-03-30
66
Last modified by: Michael Oberdorf
7-
Last modified at: 2023-12-06
7+
Last modified at: 2024-02-27
88
*************************************************************************** """
99
import argparse
1010
import json
@@ -25,7 +25,7 @@
2525

2626
# default configuration file path
2727
default_config_file = "/app/modbus_server.json"
28-
VERSION = "1.3.0"
28+
VERSION = "1.3.1"
2929

3030
log = logging.getLogger()
3131

0 commit comments

Comments
 (0)