Compare commits

...

19 Commits

Author SHA1 Message Date
Markus Opolka
d15b0a2693 Upgrading to LTS Version 5.6.18+230503 2023-05-09 08:35:37 +02:00
Markus Opolka
164767fe97 Upgrading to Version 6.0.4+230427 2023-05-03 20:17:42 +02:00
Markus Opolka
0478c67f4a Upgrading to LTS Version 5.6.17+230426 2023-05-03 20:17:05 +02:00
Markus Opolka
07fea8dfcc Upgrading to Version 6.0.2+230417 2023-04-25 10:06:46 +02:00
Markus Opolka
4250f57653 Upgrading to LTS Version 5.6.16+230418 2023-04-25 10:06:20 +02:00
Markus Opolka
919627c293 Upgrading to Version 3.28.56+230404 2023-04-25 09:56:02 +02:00
Markus Opolka
964ed7b38e Fix LTS platform build (#150) 2023-04-21 08:22:03 +02:00
Markus Opolka
9b1ee53a4a Upgrading to LTS Version 5.6.15+230412 2023-04-20 08:23:23 +02:00
Markus Opolka
d3c5ed4e35 Fix hadolint Action config 2023-04-18 15:12:00 +02:00
Markus Opolka
b1b32c2380 Upgrading to Version 6.0.1+230411 2023-04-18 09:37:50 +02:00
renovate[bot]
f79d1e3a9d Update hadolint/hadolint-action action to v3 (#147)
* Update hadolint/hadolint-action action to v3

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Markus Opolka <markus.opolka@netways.de>
2023-04-14 10:28:31 +02:00
Markus Opolka
bfa8bbb85a Merge pull request #146 from martialblog/renovate/docker-build-push-action-4.x
Update docker/build-push-action action to v4
2023-04-13 13:47:50 +02:00
Markus Opolka
9ff5cdf1cb Merge pull request #145 from martialblog/renovate/plexsystems-container-structure-test-action-0.x
Update plexsystems/container-structure-test-action action to v0.3.0
2023-04-13 13:17:49 +02:00
renovate[bot]
3552c1b90d Update docker/build-push-action action to v4 2023-04-13 11:04:01 +00:00
renovate[bot]
76a7f28105 Update plexsystems/container-structure-test-action action to v0.3.0 2023-04-13 11:03:54 +00:00
Markus Opolka
36d49a4fbb Merge pull request #143 from martialblog/renovate/hadolint-hadolint-action-1.x
Update hadolint/hadolint-action action to v1.7.0
2023-04-13 08:17:04 +02:00
renovate[bot]
b9c9c3f854 Update hadolint/hadolint-action action to v1.7.0 2023-04-13 06:07:46 +00:00
renovate[bot]
6e06dec555 Configure Renovate (#98)
* Add renovate.json

---------

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Markus Opolka <markus@martialblog.de>
2023-04-13 08:07:09 +02:00
Markus Opolka
b9627cda92 Merge pull request #141 from martialblog/chore/update-gh-actions
Update GitHub Actions
2023-04-12 13:05:19 +02:00
16 changed files with 48 additions and 44 deletions

9
.github/renovate.json vendored Normal file
View File

@@ -0,0 +1,9 @@
{
"extends": [
"config:base"
],
"enabledManagers": ["dockerfile", "github-actions"],
"dockerfile": {
"ignorePaths": ["4.0", "nginx-certbot"]
}
}

View File

@@ -16,10 +16,10 @@ jobs:
- 6.0/fpm/Dockerfile
steps:
- uses: actions/checkout@v3
- uses: hadolint/hadolint-action@v1.5.0
- uses: hadolint/hadolint-action@v3.1.0
with:
dockerfile: ${{ matrix.dockerfile }}
ignore: DL4006 DL3008 DL3018
ignore: "DL4006,DL3008,DL3018"
push_images_to_registries:
name: Push Container Images to registries
@@ -59,7 +59,7 @@ jobs:
latest=true
suffix=-apache
- name: 'Build and push latest Apache container images'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: 6.0/apache
push: true
@@ -80,7 +80,7 @@ jobs:
latest=false
suffix=-fpm
- name: 'Build and push latest fpm container images'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: 6.0/fpm
push: true
@@ -101,7 +101,7 @@ jobs:
latest=false
suffix=-fpm-alpine
- name: 'Build and push latest fpm-alpine container images'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: 6.0/fpm-alpine
push: true

View File

@@ -16,10 +16,10 @@ jobs:
- 5.0/fpm/Dockerfile
steps:
- uses: actions/checkout@v3
- uses: hadolint/hadolint-action@v1.5.0
- uses: hadolint/hadolint-action@v3.1.0
with:
dockerfile: ${{ matrix.dockerfile }}
ignore: DL4006 DL3008 DL3018
ignore: "DL4006,DL3008,DL3018"
push_images_to_registries:
name: 'Push container images to registries'
@@ -29,11 +29,6 @@ jobs:
permissions:
packages: write
contents: read
strategy:
matrix:
platform:
- linux/amd64
- linux/arm64
steps:
- name: 'Check out the repo'
uses: actions/checkout@v3
@@ -64,13 +59,13 @@ jobs:
latest=false
suffix=-apache
- name: 'Build and push LTS apache container images'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: 5.0/apache
push: true
tags: ${{ steps.metadata-apache.outputs.tags }}
labels: ${{ steps.metadata-apache.outputs.labels }}
platforms: ${{ matrix.platform }}
platforms: linux/amd64,linux/arm64
- name: 'FPM variant metadata'
id: metadata-fpm
@@ -85,13 +80,13 @@ jobs:
latest=false
suffix=-fpm
- name: 'Build and push LTS fpm container images'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: 5.0/fpm
push: true
tags: ${{ steps.metadata-fpm.outputs.tags }}
labels: ${{ steps.metadata-apache.outputs.labels }}
platforms: ${{ matrix.platform }}
platforms: linux/amd64,linux/arm64
- name: 'FPM Alpine variant metadata'
id: metadata-fpm-alpine
@@ -106,10 +101,10 @@ jobs:
latest=false
suffix=-fpm-alpine
- name: 'Build and push LTS fpm-alpine container images'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: 5.0/fpm-alpine
push: true
tags: ${{ steps.metadata-fpm-alpine.outputs.tags }}
labels: ${{ steps.metadata-apache.outputs.labels }}
platforms: ${{ matrix.platform }}
platforms: linux/amd64,linux/arm64

View File

@@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: hadolint/hadolint-action@v1.5.0
- uses: hadolint/hadolint-action@v3.1.0
with:
dockerfile: ${{ matrix.dockerfile }}
ignore: DL4006 DL3008 DL3018
ignore: "DL4006,DL3008,DL3018"

View File

@@ -33,7 +33,7 @@ jobs:
uses: docker/setup-buildx-action@v2
- name: 'Build Container images'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: 6.0/${{ matrix.context }}
push: false
@@ -42,7 +42,7 @@ jobs:
platforms: ${{ matrix.platform }}
- name: 'Run Structure tests'
uses: plexsystems/container-structure-test-action@v0.2.0
uses: plexsystems/container-structure-test-action@v0.3.0
with:
image: docker.io/martialblog/limesurvey:6-${{ matrix.context }}
config: tests/${{ matrix.context }}-tests.yaml

View File

@@ -25,7 +25,7 @@ jobs:
uses: docker/setup-buildx-action@v2
- name: 'Build Container images'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: 6.0/${{ matrix.context }}
push: false
@@ -33,7 +33,7 @@ jobs:
tags: docker.io/martialblog/limesurvey:6-${{ matrix.context }}
- name: 'Run Structure tests'
uses: plexsystems/container-structure-test-action@v0.2.0
uses: plexsystems/container-structure-test-action@v0.3.0
with:
image: docker.io/martialblog/limesurvey:6-${{ matrix.context }}
config: tests/${{ matrix.context }}-tests.yaml

View File

@@ -23,7 +23,7 @@ jobs:
uses: docker/setup-buildx-action@v2
- name: 'Build Container images'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: 5.0/${{ matrix.context }}
push: false
@@ -31,7 +31,7 @@ jobs:
tags: docker.io/martialblog/limesurvey:5-${{ matrix.context }}
- name: 'Run Structure tests'
uses: plexsystems/container-structure-test-action@v0.2.0
uses: plexsystems/container-structure-test-action@v0.3.0
with:
image: docker.io/martialblog/limesurvey:5-${{ matrix.context }}
config: tests/${{ matrix.context }}-tests.yaml

View File

@@ -59,8 +59,8 @@ RUN a2enmod headers rewrite remoteip; \
# Use the default production configuration
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
ARG version="3.28.55+230328"
ARG sha256_checksum="7f820259aa68fcd2fff7a23e9261ad65af0b28085ef93a69bf14cc068ee829c5"
ARG version="3.28.56+230404"
ARG sha256_checksum="abfdc800d97feabbd448df4a2cfa72a954d2f6b013475132b0691ac2563e7228"
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
ARG USER=root
ARG LISTEN_PORT=80

View File

@@ -33,8 +33,8 @@ RUN set -ex; \
tidy \
zip
ARG version="3.28.55+230328"
ARG sha256_checksum="7f820259aa68fcd2fff7a23e9261ad65af0b28085ef93a69bf14cc068ee829c5"
ARG version="3.28.56+230404"
ARG sha256_checksum="abfdc800d97feabbd448df4a2cfa72a954d2f6b013475132b0691ac2563e7228"
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
ENV LIMESURVEY_VERSION=$version

View File

@@ -46,8 +46,8 @@ RUN set -ex; \
tidy \
zip
ARG version="3.28.55+230328"
ARG sha256_checksum="7f820259aa68fcd2fff7a23e9261ad65af0b28085ef93a69bf14cc068ee829c5"
ARG version="3.28.56+230404"
ARG sha256_checksum="abfdc800d97feabbd448df4a2cfa72a954d2f6b013475132b0691ac2563e7228"
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
ENV LIMESURVEY_VERSION=$version

View File

@@ -60,8 +60,8 @@ RUN a2enmod headers rewrite remoteip; \
# Use the default production configuration
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
ARG version="5.6.14+230403"
ARG sha256_checksum="671689d54db6c018c5dd764c852fccd5e582c4cf743bd7fe50329d2fbab5f8a7"
ARG version="5.6.18+230503"
ARG sha256_checksum="45f537c251c2c0086c73f497ccdb0cb2681136d3df0fabc9762aeb54ac7bdfd3"
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
ARG USER=www-data
ARG LISTEN_PORT=8080

View File

@@ -34,8 +34,8 @@ RUN set -ex; \
tidy \
zip
ARG version="5.6.14+230403"
ARG sha256_checksum="671689d54db6c018c5dd764c852fccd5e582c4cf743bd7fe50329d2fbab5f8a7"
ARG version="5.6.18+230503"
ARG sha256_checksum="45f537c251c2c0086c73f497ccdb0cb2681136d3df0fabc9762aeb54ac7bdfd3"
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
ARG USER=www-data
ENV LIMESURVEY_VERSION=$version

View File

@@ -46,8 +46,8 @@ RUN set -ex; \
tidy \
zip
ARG version="5.6.14+230403"
ARG sha256_checksum="671689d54db6c018c5dd764c852fccd5e582c4cf743bd7fe50329d2fbab5f8a7"
ARG version="5.6.18+230503"
ARG sha256_checksum="45f537c251c2c0086c73f497ccdb0cb2681136d3df0fabc9762aeb54ac7bdfd3"
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
ARG USER=www-data
ENV LIMESURVEY_VERSION=$version

View File

@@ -60,8 +60,8 @@ RUN a2enmod headers rewrite remoteip; \
# Use the default production configuration
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
ARG version="6.0.0+230405"
ARG sha256_checksum="ee636330911150b5f109323b6226c48d9fd7634856b251bbf66a75a29d4b4756"
ARG version="6.0.4+230427"
ARG sha256_checksum="05f95ba3d0591402263cc9bf5b9fdb8603f6dba3ece2dbf1be795ad7ba7fa8c2"
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
ARG USER=www-data
ARG LISTEN_PORT=8080

View File

@@ -34,8 +34,8 @@ RUN set -ex; \
tidy \
zip
ARG version="6.0.0+230405"
ARG sha256_checksum="ee636330911150b5f109323b6226c48d9fd7634856b251bbf66a75a29d4b4756"
ARG version="6.0.4+230427"
ARG sha256_checksum="05f95ba3d0591402263cc9bf5b9fdb8603f6dba3ece2dbf1be795ad7ba7fa8c2"
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
ARG USER=www-data
ENV LIMESURVEY_VERSION=$version

View File

@@ -46,8 +46,8 @@ RUN set -ex; \
tidy \
zip
ARG version="6.0.0+230405"
ARG sha256_checksum="ee636330911150b5f109323b6226c48d9fd7634856b251bbf66a75a29d4b4756"
ARG version="6.0.4+230427"
ARG sha256_checksum="05f95ba3d0591402263cc9bf5b9fdb8603f6dba3ece2dbf1be795ad7ba7fa8c2"
ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/${version}.tar.gz"
ARG USER=www-data
ENV LIMESURVEY_VERSION=$version