From bd0ee6257b12909afcd207fc9d0941cdc18d0bee Mon Sep 17 00:00:00 2001 From: "S. Amir Mohammad Najafi" Date: Wed, 8 Nov 2023 13:13:56 +0330 Subject: [PATCH 01/10] fix(alpine): labels --- alpine/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 08f08f3..330dd10 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -14,7 +14,10 @@ LABEL org.opencontainers.image.title="alwatr/alpine" \ org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/alpine" \ org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/alpine" \ org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/alpine" \ - org.opencontainers.image.authors="S. Ali Mihandoost (https://ali.mihandoost.com), S. Amir Mohammad Najafi (https://njfamirm.ir/)" + org.opencontainers.image.authors="S. Ali Mihandoost (https://ali.mihandoost.com), S. Amir Mohammad Najafi (https://njfamirm.ir/)" \ + maintainer="S. Ali Mihandoost (https://ali.mihandoost.com), S. Amir Mohammad Najafi (https://njfamirm.ir/)" \ + version="3.17" \ + description="This is a lightweight Linux image for use in containerized applications. It includes only the necessary packages and dependencies to keep the image size small and efficient, packaged by Alwatr." ARG APK_TESTING RUN set -ex; \ From d08e2d3b227a515f3fe543de2aaf4209c84cbb73 Mon Sep 17 00:00:00 2001 From: "S. Amir Mohammad Najafi" Date: Wed, 8 Nov 2023 13:50:37 +0330 Subject: [PATCH 02/10] feat: move all images from old repo --- .vscode/settings.json | 8 ++------ adminer/.dockerignore | 1 + adminer/Dockerfile | 17 +++++++++++++++++ adminer/README.md | 3 +++ alpine/Dockerfile | 36 ++++++++++++++++++------------------ mariadb/.dockerignore | 1 + mariadb/Dockerfile | 17 +++++++++++++++++ mariadb/README.md | 3 +++ nocodb/.dockerignore | 1 + nocodb/Dockerfile | 18 ++++++++++++++++++ nocodb/README.md | 3 +++ traefik/.dockerignore | 1 + traefik/Dockerfile | 17 +++++++++++++++++ traefik/README.md | 3 +++ 14 files changed, 105 insertions(+), 24 deletions(-) create mode 100644 adminer/.dockerignore create mode 100644 adminer/Dockerfile create mode 100644 adminer/README.md create mode 100644 mariadb/.dockerignore create mode 100644 mariadb/Dockerfile create mode 100644 mariadb/README.md create mode 100644 nocodb/.dockerignore create mode 100644 nocodb/Dockerfile create mode 100644 nocodb/README.md create mode 100644 traefik/.dockerignore create mode 100644 traefik/Dockerfile create mode 100644 traefik/README.md diff --git a/.vscode/settings.json b/.vscode/settings.json index 4acbb7a..4653c18 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,13 +9,9 @@ "*.njk": "html", "ssh-config": "ssh_config" }, - "markdownlint.ignore": [ - "**/CHANGELOG.md" - ], + "markdownlint.ignore": ["**/CHANGELOG.md"], "cSpell.language": "en,fa,fa-IR", - "cSpell.words": [ - "Alwatr" - ], + "cSpell.words": ["adminer", "alwatr", "nocodb", "traefik"], "git.autoStash": true, "githubPullRequests.ignoredPullRequestBranches": ["main", "next"] } diff --git a/adminer/.dockerignore b/adminer/.dockerignore new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/adminer/.dockerignore @@ -0,0 +1 @@ +* diff --git a/adminer/Dockerfile b/adminer/Dockerfile new file mode 100644 index 0000000..0a6ec17 --- /dev/null +++ b/adminer/Dockerfile @@ -0,0 +1,17 @@ +FROM docker.io/wodby/adminer:4.8-3.24.4 + +ARG BUILD_REV +ARG BUILD_DATE +LABEL org.opencontainers.image.title="alwatr/adminer" \ + org.opencontainers.image.description="Database management in a single PHP file, packaged by Alwatr." \ + org.opencontainers.image.base.name="docker.io/library/adminer:4.8-3.24.4" \ + org.opencontainers.image.version="4.8" \ + org.opencontainers.image.ref.name="4.8-3.24.4" \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REV} \ + org.opencontainers.image.vendor="Alwatr" \ + org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/adminer" \ + org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/adminer" \ + org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/adminer" \ + org.opencontainers.image.authors="S. Ali Mihandoost (https://ali.mihandoost.com), S. Amir Mohammad Najafi (https://njfamirm.ir/)" diff --git a/adminer/README.md b/adminer/README.md new file mode 100644 index 0000000..23563c4 --- /dev/null +++ b/adminer/README.md @@ -0,0 +1,3 @@ +# Alwatr Adminer Container + +Database management in a single PHP file, packaged by Alwatr. diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 330dd10..2f9db0d 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,5 +1,23 @@ FROM docker.io/library/alpine:3.17 +ARG APK_TESTING +RUN set -ex; \ + if [ "$APK_TESTING" != "1" ]; then \ + echo "Skip alpine edge testing repository"; \ + else \ + echo "Add alpine edge testing repository"; \ + echo 'https://dl-cdn.alpinelinux.org/alpine/edge/testing/' >> /etc/apk/repositories; \ + fi + +ARG APK_INSTALL +RUN set -ex; \ + if [ "$APK_INSTALL" != "1" ]; then \ + echo "Skip apk install"; \ + else \ + echo "Add alpine edge testing repository"; \ + apk add --no-cache ${APK_INSTALL}; \ + fi + ARG BUILD_REV ARG BUILD_DATE LABEL org.opencontainers.image.title="alwatr/alpine" \ @@ -18,21 +36,3 @@ LABEL org.opencontainers.image.title="alwatr/alpine" \ maintainer="S. Ali Mihandoost (https://ali.mihandoost.com), S. Amir Mohammad Najafi (https://njfamirm.ir/)" \ version="3.17" \ description="This is a lightweight Linux image for use in containerized applications. It includes only the necessary packages and dependencies to keep the image size small and efficient, packaged by Alwatr." - -ARG APK_TESTING -RUN set -ex; \ - if [ "$APK_TESTING" != "1" ]; then \ - echo "Skip alpine edge testing repository"; \ - else \ - echo "Add alpine edge testing repository"; \ - echo 'https://dl-cdn.alpinelinux.org/alpine/edge/testing/' >> /etc/apk/repositories; \ - fi - -ARG APK_INSTALL -RUN set -ex; \ - if [ "$APK_INSTALL" != "1" ]; then \ - echo "Skip apk install"; \ - else \ - echo "Add alpine edge testing repository"; \ - apk add --no-cache ${APK_INSTALL}; \ - fi diff --git a/mariadb/.dockerignore b/mariadb/.dockerignore new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/mariadb/.dockerignore @@ -0,0 +1 @@ +* diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile new file mode 100644 index 0000000..4bbace8 --- /dev/null +++ b/mariadb/Dockerfile @@ -0,0 +1,17 @@ +FROM docker.io/wodby/mariadb:10.9-3.26.4 + +ARG BUILD_REV +ARG BUILD_DATE +LABEL org.opencontainers.image.title="alwatr/mariadb" \ + org.opencontainers.image.description="A fork of the MySQL relational database management system, packaged by Alwatr." \ + org.opencontainers.image.base.name="docker.io/wodby/mariadb:10.9-3.26.4" \ + org.opencontainers.image.version="10.9" \ + org.opencontainers.image.ref.name="10.9-3.26.4" \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REV} \ + org.opencontainers.image.vendor="Alwatr" \ + org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/mariadb" \ + org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/mariadb" \ + org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/mariadb" \ + org.opencontainers.image.authors="S. Ali Mihandoost (https://ali.mihandoost.com), S. Amir Mohammad Najafi (https://njfamirm.ir/)" diff --git a/mariadb/README.md b/mariadb/README.md new file mode 100644 index 0000000..e6ace58 --- /dev/null +++ b/mariadb/README.md @@ -0,0 +1,3 @@ +# Alwatr Mariadb Container + +A fork of the MySQL relational database management system, packaged by Alwatr. diff --git a/nocodb/.dockerignore b/nocodb/.dockerignore new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/nocodb/.dockerignore @@ -0,0 +1 @@ +* diff --git a/nocodb/Dockerfile b/nocodb/Dockerfile new file mode 100644 index 0000000..2328cb0 --- /dev/null +++ b/nocodb/Dockerfile @@ -0,0 +1,18 @@ +FROM docker.io/nocodb/nocodb:0.202.5 + +ARG BUILD_REV +ARG BUILD_DATE +LABEL org.opencontainers.image.title="alwatr/nocodb" \ + org.opencontainers.image.description="A free, open-source, self-hosted, and extensible database management tool that helps you easily manage and visualize your data, packaged by Alwatr." \ + org.opencontainers.image.base.name="docker.io/wodby/nocodb:0.202.5" \ + org.opencontainers.image.version="0.202.5" \ + org.opencontainers.image.ref.name="0.202.5" \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REV} \ + org.opencontainers.image.vendor="Alwatr" \ + org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/nocodb" \ + org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/nocodb" \ + org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/nocodb" \ + org.opencontainers.image.authors="S. Ali Mihandoost (https://ali.mihandoost.com), S. Amir Mohammad Najafi (https://njfamirm.ir/)" + diff --git a/nocodb/README.md b/nocodb/README.md new file mode 100644 index 0000000..d2101d9 --- /dev/null +++ b/nocodb/README.md @@ -0,0 +1,3 @@ +# Alwatr Nocodb Container + +A free, open-source, self-hosted, and extensible database management tool that helps you easily manage and visualize your data, packaged by Alwatr. diff --git a/traefik/.dockerignore b/traefik/.dockerignore new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/traefik/.dockerignore @@ -0,0 +1 @@ +* diff --git a/traefik/Dockerfile b/traefik/Dockerfile new file mode 100644 index 0000000..73cdfcb --- /dev/null +++ b/traefik/Dockerfile @@ -0,0 +1,17 @@ +FROM docker.io/library/traefik:v1.7.34-alpine + +ARG BUILD_REV +ARG BUILD_DATE +LABEL org.opencontainers.image.title="alwatr/traefik" \ + org.opencontainers.image.description="A modern reverse-proxy, packaged by Alwatr." \ + org.opencontainers.image.base.name="docker.io/library/traefik:v1.7.34-alpine" \ + org.opencontainers.image.version="v1.7.34" \ + org.opencontainers.image.ref.name="v1.7.34-alpine" \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REV} \ + org.opencontainers.image.vendor="Alwatr" \ + org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/traefik" \ + org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/traefik" \ + org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/traefik" \ + org.opencontainers.image.authors="S. Ali Mihandoost (https://ali.mihandoost.com), S. Amir Mohammad Najafi (https://njfamirm.ir/)" diff --git a/traefik/README.md b/traefik/README.md new file mode 100644 index 0000000..59dc90a --- /dev/null +++ b/traefik/README.md @@ -0,0 +1,3 @@ +# Alwatr Traefik Container + +A modern reverse-proxy, packaged by Alwatr. From 6f6565303563dfb1e7d80d868c15d67e9aa6ff64 Mon Sep 17 00:00:00 2001 From: "S. Amir Mohammad Najafi" Date: Wed, 8 Nov 2023 13:56:49 +0330 Subject: [PATCH 03/10] chore(ci): add all images --- .github/workflows/publish-container.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml index 7fe7281..34f3502 100644 --- a/.github/workflows/publish-container.yml +++ b/.github/workflows/publish-container.yml @@ -26,6 +26,12 @@ jobs: fail-fast: false matrix: include: + - image: traefik + path: traefik + version: + short: 1 + full: 1.7.34-alpine + - name: alpine path: alpine version: @@ -50,6 +56,24 @@ jobs: short: 8 full: 8.2 + - image: adminer + path: adminer + version: + short: 4 + full: 4.8-3.24.4 + + - image: mariadb + path: mariadb + version: + short: 10 + full: 10.9-3.26.4 + + - image: nocodb + path: nocodb + version: + short: 0.202 + full: 0.202.5 + - name: wordpress path: wordpress/php7.4 version: From ed8b3f11c0863f3975586c6878c27f19f55c69c8 Mon Sep 17 00:00:00 2001 From: "S. Amir Mohammad Najafi" Date: Wed, 8 Nov 2023 14:08:14 +0330 Subject: [PATCH 04/10] chore(ci): fix image name key --- .github/workflows/publish-container.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml index 34f3502..50b3b2e 100644 --- a/.github/workflows/publish-container.yml +++ b/.github/workflows/publish-container.yml @@ -26,7 +26,7 @@ jobs: fail-fast: false matrix: include: - - image: traefik + - name: traefik path: traefik version: short: 1 @@ -56,19 +56,19 @@ jobs: short: 8 full: 8.2 - - image: adminer + - name: adminer path: adminer version: short: 4 full: 4.8-3.24.4 - - image: mariadb + - name: mariadb path: mariadb version: short: 10 full: 10.9-3.26.4 - - image: nocodb + - name: nocodb path: nocodb version: short: 0.202 From 05bd48c2e1ff2d6b5d117568a37b65d0a75512c3 Mon Sep 17 00:00:00 2001 From: "S. Amir Mohammad Najafi" Date: Wed, 8 Nov 2023 14:33:54 +0330 Subject: [PATCH 05/10] feat: traefik v3 --- .github/workflows/publish-container.yml | 10 ++++++++-- traefik/{ => 1}/.dockerignore | 0 traefik/{ => 1}/Dockerfile | 8 ++++---- traefik/{ => 1}/README.md | 0 traefik/3/.dockerignore | 1 + traefik/3/Dockerfile | 17 +++++++++++++++++ traefik/3/README.md | 3 +++ 7 files changed, 33 insertions(+), 6 deletions(-) rename traefik/{ => 1}/.dockerignore (100%) rename traefik/{ => 1}/Dockerfile (84%) rename traefik/{ => 1}/README.md (100%) create mode 100644 traefik/3/.dockerignore create mode 100644 traefik/3/Dockerfile create mode 100644 traefik/3/README.md diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml index 50b3b2e..27e0465 100644 --- a/.github/workflows/publish-container.yml +++ b/.github/workflows/publish-container.yml @@ -27,10 +27,16 @@ jobs: matrix: include: - name: traefik - path: traefik + path: traefik/1/ version: short: 1 - full: 1.7.34-alpine + full: 1.7.34 + + - name: traefik + path: traefik/3/ + version: + short: 3 + full: 3.0.0-beta4 - name: alpine path: alpine diff --git a/traefik/.dockerignore b/traefik/1/.dockerignore similarity index 100% rename from traefik/.dockerignore rename to traefik/1/.dockerignore diff --git a/traefik/Dockerfile b/traefik/1/Dockerfile similarity index 84% rename from traefik/Dockerfile rename to traefik/1/Dockerfile index 73cdfcb..22a2153 100644 --- a/traefik/Dockerfile +++ b/traefik/1/Dockerfile @@ -5,13 +5,13 @@ ARG BUILD_DATE LABEL org.opencontainers.image.title="alwatr/traefik" \ org.opencontainers.image.description="A modern reverse-proxy, packaged by Alwatr." \ org.opencontainers.image.base.name="docker.io/library/traefik:v1.7.34-alpine" \ - org.opencontainers.image.version="v1.7.34" \ - org.opencontainers.image.ref.name="v1.7.34-alpine" \ + org.opencontainers.image.version="1.7.34" \ + org.opencontainers.image.ref.name="1.7.34-alpine" \ org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REV} \ org.opencontainers.image.vendor="Alwatr" \ - org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/traefik" \ - org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/traefik" \ + org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/traefik/1" \ + org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/traefik/1" \ org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/traefik" \ org.opencontainers.image.authors="S. Ali Mihandoost (https://ali.mihandoost.com), S. Amir Mohammad Najafi (https://njfamirm.ir/)" diff --git a/traefik/README.md b/traefik/1/README.md similarity index 100% rename from traefik/README.md rename to traefik/1/README.md diff --git a/traefik/3/.dockerignore b/traefik/3/.dockerignore new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/traefik/3/.dockerignore @@ -0,0 +1 @@ +* diff --git a/traefik/3/Dockerfile b/traefik/3/Dockerfile new file mode 100644 index 0000000..53036ec --- /dev/null +++ b/traefik/3/Dockerfile @@ -0,0 +1,17 @@ +FROM docker.io/library/traefik:v3.0.0-beta4 + +ARG BUILD_REV +ARG BUILD_DATE +LABEL org.opencontainers.image.title="alwatr/traefik" \ + org.opencontainers.image.description="A modern reverse-proxy, packaged by Alwatr." \ + org.opencontainers.image.base.name="docker.io/library/traefik:v3.0.0-beta4" \ + org.opencontainers.image.version="3.0.0-beta4" \ + org.opencontainers.image.ref.name="3.0.0-beta4" \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REV} \ + org.opencontainers.image.vendor="Alwatr" \ + org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/traefik/3" \ + org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/traefik/3" \ + org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/traefik" \ + org.opencontainers.image.authors="S. Ali Mihandoost (https://ali.mihandoost.com), S. Amir Mohammad Najafi (https://njfamirm.ir/)" diff --git a/traefik/3/README.md b/traefik/3/README.md new file mode 100644 index 0000000..59dc90a --- /dev/null +++ b/traefik/3/README.md @@ -0,0 +1,3 @@ +# Alwatr Traefik Container + +A modern reverse-proxy, packaged by Alwatr. From 9dd4c38a6fcca57288398e47bd604e6bf16a3e01 Mon Sep 17 00:00:00 2001 From: "S. Amir Mohammad Najafi" Date: Wed, 8 Nov 2023 14:39:19 +0330 Subject: [PATCH 06/10] feat: add mariadb v10.11 --- .github/workflows/publish-container.yml | 18 +++++++++--------- mariadb/{ => 10.11}/.dockerignore | 0 mariadb/{ => 10.11}/Dockerfile | 12 ++++++------ mariadb/{ => 10.11}/README.md | 0 4 files changed, 15 insertions(+), 15 deletions(-) rename mariadb/{ => 10.11}/.dockerignore (100%) rename mariadb/{ => 10.11}/Dockerfile (78%) rename mariadb/{ => 10.11}/README.md (100%) diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml index 27e0465..b4985fc 100644 --- a/.github/workflows/publish-container.yml +++ b/.github/workflows/publish-container.yml @@ -27,13 +27,13 @@ jobs: matrix: include: - name: traefik - path: traefik/1/ + path: traefik/1 version: short: 1 full: 1.7.34 - name: traefik - path: traefik/3/ + path: traefik/3 version: short: 3 full: 3.0.0-beta4 @@ -44,6 +44,12 @@ jobs: short: 3 full: 3.17 + - name: nocodb + path: nocodb + version: + short: 0.202 + full: 0.202.5 + - name: php path: php/7.4-apache version: @@ -69,17 +75,11 @@ jobs: full: 4.8-3.24.4 - name: mariadb - path: mariadb + path: mariadb/10.11 version: short: 10 full: 10.9-3.26.4 - - name: nocodb - path: nocodb - version: - short: 0.202 - full: 0.202.5 - - name: wordpress path: wordpress/php7.4 version: diff --git a/mariadb/.dockerignore b/mariadb/10.11/.dockerignore similarity index 100% rename from mariadb/.dockerignore rename to mariadb/10.11/.dockerignore diff --git a/mariadb/Dockerfile b/mariadb/10.11/Dockerfile similarity index 78% rename from mariadb/Dockerfile rename to mariadb/10.11/Dockerfile index 4bbace8..1a46568 100644 --- a/mariadb/Dockerfile +++ b/mariadb/10.11/Dockerfile @@ -1,17 +1,17 @@ -FROM docker.io/wodby/mariadb:10.9-3.26.4 +FROM docker.io/wodby/mariadb:10.11-3.26.4 ARG BUILD_REV ARG BUILD_DATE LABEL org.opencontainers.image.title="alwatr/mariadb" \ org.opencontainers.image.description="A fork of the MySQL relational database management system, packaged by Alwatr." \ - org.opencontainers.image.base.name="docker.io/wodby/mariadb:10.9-3.26.4" \ - org.opencontainers.image.version="10.9" \ - org.opencontainers.image.ref.name="10.9-3.26.4" \ + org.opencontainers.image.base.name="docker.io/wodby/mariadb:10.11-3.26.4" \ + org.opencontainers.image.version="10.11" \ + org.opencontainers.image.ref.name="10.11-3.26.4" \ org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REV} \ org.opencontainers.image.vendor="Alwatr" \ - org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/mariadb" \ - org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/mariadb" \ + org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/mariadb/10.11" \ + org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/mariadb/10.11" \ org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/mariadb" \ org.opencontainers.image.authors="S. Ali Mihandoost (https://ali.mihandoost.com), S. Amir Mohammad Najafi (https://njfamirm.ir/)" diff --git a/mariadb/README.md b/mariadb/10.11/README.md similarity index 100% rename from mariadb/README.md rename to mariadb/10.11/README.md From 6716747f5ce1056a1949cbbbb2201009c5a10341 Mon Sep 17 00:00:00 2001 From: "S. Amir Mohammad Najafi" Date: Wed, 8 Nov 2023 14:40:20 +0330 Subject: [PATCH 07/10] chore: fix url --- mariadb/10.11/Dockerfile | 4 ++-- php/7.4-fpm/Dockerfile | 4 ++-- traefik/1/Dockerfile | 4 ++-- traefik/3/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mariadb/10.11/Dockerfile b/mariadb/10.11/Dockerfile index 1a46568..b9a7ade 100644 --- a/mariadb/10.11/Dockerfile +++ b/mariadb/10.11/Dockerfile @@ -11,7 +11,7 @@ LABEL org.opencontainers.image.title="alwatr/mariadb" \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REV} \ org.opencontainers.image.vendor="Alwatr" \ - org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/mariadb/10.11" \ - org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/mariadb/10.11" \ + org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/mariadb" \ + org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/mariadb" \ org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/mariadb" \ org.opencontainers.image.authors="S. Ali Mihandoost (https://ali.mihandoost.com), S. Amir Mohammad Najafi (https://njfamirm.ir/)" diff --git a/php/7.4-fpm/Dockerfile b/php/7.4-fpm/Dockerfile index fc7da03..22c9fb4 100644 --- a/php/7.4-fpm/Dockerfile +++ b/php/7.4-fpm/Dockerfile @@ -11,7 +11,7 @@ LABEL org.opencontainers.image.title="alwatr/php" \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REV} \ org.opencontainers.image.vendor="Alwatr" \ - org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/php/7.4-fpm" \ - org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/php/7.4-fpm" \ + org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/php" \ + org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/php" \ org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/php" \ org.opencontainers.image.authors="S. Ali Mihandoost (https://ali.mihandoost.com), S. Amir Mohammad Najafi (https://njfamirm.ir/)" diff --git a/traefik/1/Dockerfile b/traefik/1/Dockerfile index 22a2153..00b97c4 100644 --- a/traefik/1/Dockerfile +++ b/traefik/1/Dockerfile @@ -11,7 +11,7 @@ LABEL org.opencontainers.image.title="alwatr/traefik" \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REV} \ org.opencontainers.image.vendor="Alwatr" \ - org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/traefik/1" \ - org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/traefik/1" \ + org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/traefik" \ + org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/traefik" \ org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/traefik" \ org.opencontainers.image.authors="S. Ali Mihandoost (https://ali.mihandoost.com), S. Amir Mohammad Najafi (https://njfamirm.ir/)" diff --git a/traefik/3/Dockerfile b/traefik/3/Dockerfile index 53036ec..5e1b844 100644 --- a/traefik/3/Dockerfile +++ b/traefik/3/Dockerfile @@ -11,7 +11,7 @@ LABEL org.opencontainers.image.title="alwatr/traefik" \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REV} \ org.opencontainers.image.vendor="Alwatr" \ - org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/traefik/3" \ - org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/traefik/3" \ + org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/traefik" \ + org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/traefik" \ org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/traefik" \ org.opencontainers.image.authors="S. Ali Mihandoost (https://ali.mihandoost.com), S. Amir Mohammad Najafi (https://njfamirm.ir/)" From 18b49919cf4cba1741ecc452042d5554d5a493f8 Mon Sep 17 00:00:00 2001 From: "S. Amir Mohammad Najafi" Date: Wed, 8 Nov 2023 14:44:38 +0330 Subject: [PATCH 08/10] chore(ci): version --- .github/workflows/publish-container.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml index b4985fc..c5f3ff2 100644 --- a/.github/workflows/publish-container.yml +++ b/.github/workflows/publish-container.yml @@ -47,7 +47,7 @@ jobs: - name: nocodb path: nocodb version: - short: 0.202 + short: 0 full: 0.202.5 - name: php @@ -78,7 +78,7 @@ jobs: path: mariadb/10.11 version: short: 10 - full: 10.9-3.26.4 + full: 10.11-3.26.4 - name: wordpress path: wordpress/php7.4 From 87621ba1779f1e9d6379f68c590c6ab7fca23860 Mon Sep 17 00:00:00 2001 From: Ali Mihandoost Date: Wed, 8 Nov 2023 15:03:47 +0330 Subject: [PATCH 09/10] docs(traefik): readme --- traefik/1/README.md | 3 --- traefik/3/README.md | 3 --- traefik/README.md | 5 +++++ 3 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 traefik/1/README.md delete mode 100644 traefik/3/README.md create mode 100644 traefik/README.md diff --git a/traefik/1/README.md b/traefik/1/README.md deleted file mode 100644 index 59dc90a..0000000 --- a/traefik/1/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Alwatr Traefik Container - -A modern reverse-proxy, packaged by Alwatr. diff --git a/traefik/3/README.md b/traefik/3/README.md deleted file mode 100644 index 59dc90a..0000000 --- a/traefik/3/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Alwatr Traefik Container - -A modern reverse-proxy, packaged by Alwatr. diff --git a/traefik/README.md b/traefik/README.md new file mode 100644 index 0000000..30b6ecb --- /dev/null +++ b/traefik/README.md @@ -0,0 +1,5 @@ +# Alwatr Traefik Container + +Traefik is designed to work with modern container orchestration platforms like Docker and Kubernetes, and it can automatically discover new services as they are added to the environment. It also provides advanced features like automatic SSL certificate generation and renewal, dynamic routing based on service health checks, and support for multiple backends. + +For more information on Traefik, see the official documentation at . From 5f3a58d32ad7be4f4c80a5d928287aa399e21afb Mon Sep 17 00:00:00 2001 From: "S. Amir Mohammad Najafi" Date: Wed, 8 Nov 2023 15:04:24 +0330 Subject: [PATCH 10/10] feat: mariadb v11 --- .github/workflows/publish-container.yml | 10 ++++++++-- mariadb/{10.11 => 10}/.dockerignore | 0 mariadb/{10.11 => 10}/Dockerfile | 8 ++++---- mariadb/11/.dockerignore | 1 + mariadb/11/Dockerfile | 17 +++++++++++++++++ mariadb/{10.11 => }/README.md | 0 6 files changed, 30 insertions(+), 6 deletions(-) rename mariadb/{10.11 => 10}/.dockerignore (100%) rename mariadb/{10.11 => 10}/Dockerfile (85%) create mode 100644 mariadb/11/.dockerignore create mode 100644 mariadb/11/Dockerfile rename mariadb/{10.11 => }/README.md (100%) diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml index c5f3ff2..c9be070 100644 --- a/.github/workflows/publish-container.yml +++ b/.github/workflows/publish-container.yml @@ -75,10 +75,16 @@ jobs: full: 4.8-3.24.4 - name: mariadb - path: mariadb/10.11 + path: mariadb/11 + version: + short: 11 + full: 11.0-3.26.4 + + - name: mariadb + path: mariadb/10 version: short: 10 - full: 10.11-3.26.4 + full: 10.9-3.26.4 - name: wordpress path: wordpress/php7.4 diff --git a/mariadb/10.11/.dockerignore b/mariadb/10/.dockerignore similarity index 100% rename from mariadb/10.11/.dockerignore rename to mariadb/10/.dockerignore diff --git a/mariadb/10.11/Dockerfile b/mariadb/10/Dockerfile similarity index 85% rename from mariadb/10.11/Dockerfile rename to mariadb/10/Dockerfile index b9a7ade..4bbace8 100644 --- a/mariadb/10.11/Dockerfile +++ b/mariadb/10/Dockerfile @@ -1,12 +1,12 @@ -FROM docker.io/wodby/mariadb:10.11-3.26.4 +FROM docker.io/wodby/mariadb:10.9-3.26.4 ARG BUILD_REV ARG BUILD_DATE LABEL org.opencontainers.image.title="alwatr/mariadb" \ org.opencontainers.image.description="A fork of the MySQL relational database management system, packaged by Alwatr." \ - org.opencontainers.image.base.name="docker.io/wodby/mariadb:10.11-3.26.4" \ - org.opencontainers.image.version="10.11" \ - org.opencontainers.image.ref.name="10.11-3.26.4" \ + org.opencontainers.image.base.name="docker.io/wodby/mariadb:10.9-3.26.4" \ + org.opencontainers.image.version="10.9" \ + org.opencontainers.image.ref.name="10.9-3.26.4" \ org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REV} \ diff --git a/mariadb/11/.dockerignore b/mariadb/11/.dockerignore new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/mariadb/11/.dockerignore @@ -0,0 +1 @@ +* diff --git a/mariadb/11/Dockerfile b/mariadb/11/Dockerfile new file mode 100644 index 0000000..3d298d6 --- /dev/null +++ b/mariadb/11/Dockerfile @@ -0,0 +1,17 @@ +FROM docker.io/wodby/mariadb:11.0-3.26.4 + +ARG BUILD_REV +ARG BUILD_DATE +LABEL org.opencontainers.image.title="alwatr/mariadb" \ + org.opencontainers.image.description="A fork of the MySQL relational database management system, packaged by Alwatr." \ + org.opencontainers.image.base.name="docker.io/wodby/mariadb:11.0-3.26.4" \ + org.opencontainers.image.version="11.0" \ + org.opencontainers.image.ref.name="11.0-3.26.4" \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REV} \ + org.opencontainers.image.vendor="Alwatr" \ + org.opencontainers.image.source="https://github.com/Alwatr/containers/tree/main/mariadb" \ + org.opencontainers.image.url="https://github.com/Alwatr/containers/tree/main/mariadb" \ + org.opencontainers.image.documentation="https://github.com/Alwatr/containers/tree/main/mariadb" \ + org.opencontainers.image.authors="S. Ali Mihandoost (https://ali.mihandoost.com), S. Amir Mohammad Najafi (https://njfamirm.ir/)" diff --git a/mariadb/10.11/README.md b/mariadb/README.md similarity index 100% rename from mariadb/10.11/README.md rename to mariadb/README.md