diff --git a/.image-gitlab-ci.yml b/.image-gitlab-ci.yml index 8843a173..366b3116 100644 --- a/.image-gitlab-ci.yml +++ b/.image-gitlab-ci.yml @@ -4,7 +4,7 @@ variables: IMAGE: {{ IMAGE }} PLATFORMS: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7 REGISTRY: $REGISTRY_URI/$CI_PROJECT_PATH - TRIVY_VERSION: 0.72.0 + TRIVY_VERSION: 0.73.0 stages: - Static Code Analysis @@ -13,7 +13,7 @@ stages: - Security Scan - Promote Image -image: docker:29.5.2 +image: docker:29.7.1 .registry_template: ®istry_login before_script: diff --git a/README.md b/README.md index c7c29afb..533cff98 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ easy. Contents: | services | non-clustered docker-compose services | | ssl | PKI certificate tools (deprecated by k8s) | -Find images at [docker hub/instantlinux](https://hub.docker.com/r/instantlinux/). Each image is scanned by [trivy](https://trivy.dev/) to ensure they contain no known CVE vulnerabilities before promotion to Docker Hub. +Find images at [docker hub/instantlinux](https://hub.docker.com/r/instantlinux/) or [ghcr.io/instantlinux](https://github.com/instantlinux?tab=packages). Each image is scanned by [trivy](https://trivy.dev/) to ensure they contain no known CVE vulnerabilities before promotion to ghcr.io and Docker Hub. Find a lot more details about the Kubernetes bare-metal installer in [k8s/README](k8s/README.md). diff --git a/ansible/roles/kubernetes/templates/kubeadm-config-cplane.j2 b/ansible/roles/kubernetes/templates/kubeadm-config-cplane.j2 deleted file mode 100644 index 87009436..00000000 --- a/ansible/roles/kubernetes/templates/kubeadm-config-cplane.j2 +++ /dev/null @@ -1,87 +0,0 @@ ---- -# This file generated by ansible -# -apiVersion: kubeadm.k8s.io/v1beta4 -kind: InitConfiguration -bootstrapTokens: -- token: {{ vault_k8s.join_token }} - ttl: 1h0m0s - usages: - - signing - - authentication - groups: - - system:bootstrappers:kubeadm:default-node-token -localAPIEndpoint: - advertiseAddress: {{ k8s.cplane_hostip }} - bindPort: 6443 -nodeRegistration: - criSocket: {{ k8s.cri_socket }} - imagePullPolicy: IfNotPresent - imagePullSerial: true - name: {{ ansible_fqdn }} - taints: - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane - -# Some default values, uncomment and modify as desired -# timeouts: -# controlPlaneComponentHealthCheck: 4m0s -# discovery: 5m0s -# etcdAPICall: 2m0s -# kubeletHealthCheck: 4m0s -# kubernetesAPICall: 1m0s -# tlsBootstrap: 5m0s -# upgradeManifests: 5m0s ---- -apiVersion: kubeadm.k8s.io/v1beta4 -kind: ClusterConfiguration -apiServer: - certSANs: - - {{ k8s.cplane_hostip }} - - {{ k8s.cplane_vip }} - extraArgs: - - name: encryption-provider-config - value: /etc/kubernetes/local/api-crypt.conf - - name: oidc-issuer-url - value: {{ oidc.issuer_url }} - - name: oidc-client-id - value: {{ oidc.client_id }} - - name: oidc-username-claim - value: {{ oidc.username_claim }} - - name: oidc-groups-claim - value: {{ oidc.groups_claim }} - - name: oidc-username-prefix - value: {{ oidc.username_prefix }} - - name: oidc-groups-prefix - value: {{ oidc.group_prefix }} - - name: oidc-ca-file - value: {{ oidc.ca_file }} - extraVolumes: - - name: local-config - hostPath: "/etc/kubernetes/local" - mountPath: "/etc/kubernetes/local" - readOnly: true - pathType: DirectoryOrCreate -controlPlaneEndpoint: "{{ k8s.cplane_vip }}:6443" -dns: - # Workaround for bug 112131; never got fixed as of k8s 1.31: - # https://github.com/kubernetes/kubernetes/issues/112131 - imageRepository: registry.k8s.io/coredns - imageTag: {{ k8s.coredns_version }} -imageRepository: registry.k8s.io -kubernetesVersion: v{{ k8s.version }} -networking: - dnsDomain: cluster.local - podSubnet: {{ k8s.pod_network }} - serviceSubnet: {{ k8s.service_network }} - -# Some default values, uncomment and modify as desired -# caCertificateValidityPeriod: 87600h0m0s -# certificateValidityPeriod: 8760h0m0s -# certificatesDir: /etc/kubernetes/pki -# clusterName: kubernetes -# controllerManager: {} -# encryptionAlgorithm: RSA-2048 -# etcd: -# local: -# dataDir: /var/lib/etcd diff --git a/images/blacklist/Dockerfile b/images/blacklist/Dockerfile index a76446af..ffd046ea 100644 --- a/images/blacklist/Dockerfile +++ b/images/blacklist/Dockerfile @@ -2,6 +2,7 @@ FROM debian:trixie-slim ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=Apache-2.0 \ org.label-schema.name=blacklist \ diff --git a/images/blacklist/README.md b/images/blacklist/README.md index a26a8bdc..2511a9cb 100644 --- a/images/blacklist/README.md +++ b/images/blacklist/README.md @@ -1,5 +1,5 @@ ## DNS blacklist for spamassassin -[![](https://img.shields.io/docker/v/instantlinux/blacklist?sort=date)](https://hub.docker.com/r/instantlinux/blacklist/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/blacklist?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/blacklist "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/blacklist/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/blacklist?sort=date)](https://hub.docker.com/r/instantlinux/blacklist/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/blacklist?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/blacklist "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/blacklist/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/blacklist) This is based on [Running Your Own RBL DNS Blacklist](http://www.blue-quartz.com/rbl/) (or see [alt link](https://g33kinfo.com/info/running-your-own-rbl-dns-blacklist/)) using the Debian rbldnsd package adapted from scripts published by Herb Rubin some years ago. diff --git a/images/blacklist/hooks/add_tags b/images/blacklist/hooks/add_tags index fe893b87..632e7b1a 100755 --- a/images/blacklist/hooks/add_tags +++ b/images/blacklist/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "ARG RBLDNSD_VERSION=" Dockerfile |cut -d = -f 2|cut -d '~' -f 1) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "ARG RBLDNSD_VERSION=" Dockerfile |cut -d = -f 2|cut -d '~' -f 1) diff --git a/images/blacklist/hooks/build b/images/blacklist/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/blacklist/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/blacklist/hooks/post_push b/images/blacklist/hooks/post_push deleted file mode 100755 index 682d2cb6..00000000 --- a/images/blacklist/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG RBLDNSD_VERSION" Dockerfile | grep -oP '(?<=ION=).*(?=~)') -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/data-sync/Dockerfile b/images/data-sync/Dockerfile index b5177901..140dafd6 100644 --- a/images/data-sync/Dockerfile +++ b/images/data-sync/Dockerfile @@ -2,6 +2,7 @@ FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.license=Apache-2.0 \ org.label-schema.name=data-sync \ org.label-schema.vcs-ref=$VCS_REF \ diff --git a/images/data-sync/README.md b/images/data-sync/README.md index c22590ea..e2369697 100644 --- a/images/data-sync/README.md +++ b/images/data-sync/README.md @@ -1,5 +1,5 @@ ## data-sync -[![](https://img.shields.io/docker/v/instantlinux/data-sync?sort=date)](https://hub.docker.com/r/instantlinux/data-sync/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/data-sync?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/data-sync "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/data-sync/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/data-sync?sort=date)](https://hub.docker.com/r/instantlinux/data-sync/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/data-sync?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/data-sync "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/data-sync/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/data-sync) This provides HA storage for a bare-metal cluster. NAS servers are not usually HA and SAN installations are costly. Add this resource definition to your Kubernetes cluster and the volumes you mount under a directory /var/data-sync will be kept in sync using the [unison](https://www.cis.upenn.edu/~bcpierce/unison/) file synchronizer from UPenn. diff --git a/images/data-sync/hooks/add_tags b/images/data-sync/hooks/add_tags index 43608e50..a662fe3f 100755 --- a/images/data-sync/hooks/add_tags +++ b/images/data-sync/hooks/add_tags @@ -1,4 +1,4 @@ #!/bin/sh VER1=$(grep "ARG UNISON_VERSION" Dockerfile | cut -d= -f 2) VER2=$(grep "ARG OCAML_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$VER1-$VER2" +echo $VER1-$VER2 diff --git a/images/data-sync/hooks/build b/images/data-sync/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/data-sync/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/data-sync/hooks/post_push b/images/data-sync/hooks/post_push deleted file mode 100755 index fc843c18..00000000 --- a/images/data-sync/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/davite/hooks/build b/images/davite/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/davite/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/ddclient/Dockerfile b/images/ddclient/Dockerfile index 8a664a51..f2468fc9 100644 --- a/images/ddclient/Dockerfile +++ b/images/ddclient/Dockerfile @@ -2,6 +2,7 @@ FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=GPL-2.0 \ org.label-schema.name=ddclient \ diff --git a/images/ddclient/README.md b/images/ddclient/README.md index 4f14226e..428eb8cf 100644 --- a/images/ddclient/README.md +++ b/images/ddclient/README.md @@ -1,5 +1,5 @@ ## ddclient -[![](https://img.shields.io/docker/v/instantlinux/ddclient?sort=date)](https://hub.docker.com/r/instantlinux/ddclient/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/ddclient?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/ddclient "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/ddclient/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/ddclient?sort=date)](https://hub.docker.com/r/instantlinux/ddclient/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/ddclient?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/ddclient "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/ddclient/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/ddclient) Dynamic-DNS client - automatically updates a public DNS name with your dynamic IP address. Set this up under Kubernetes or Docker Swarm to ensure it's always running. diff --git a/images/ddclient/hooks/add_tags b/images/ddclient/hooks/add_tags index 303d1afe..ff9ebf1d 100755 --- a/images/ddclient/hooks/add_tags +++ b/images/ddclient/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) diff --git a/images/ddclient/hooks/build b/images/ddclient/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/ddclient/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/ddclient/hooks/post_push b/images/ddclient/hooks/post_push deleted file mode 100755 index fc843c18..00000000 --- a/images/ddclient/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/dhcpd-dns-pxe/Dockerfile b/images/dhcpd-dns-pxe/Dockerfile index bb741d33..56fd2746 100644 --- a/images/dhcpd-dns-pxe/Dockerfile +++ b/images/dhcpd-dns-pxe/Dockerfile @@ -2,6 +2,7 @@ FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=Apache-2.0 \ org.label-schema.name=dhcpd-dns-pxe \ diff --git a/images/dhcpd-dns-pxe/README.md b/images/dhcpd-dns-pxe/README.md index 71bb9cc4..06a05264 100644 --- a/images/dhcpd-dns-pxe/README.md +++ b/images/dhcpd-dns-pxe/README.md @@ -1,5 +1,5 @@ ## dhcpd-dns-pxe -[![](https://img.shields.io/docker/v/instantlinux/dhcpd-dns-pxe?sort=date)](https://hub.docker.com/r/instantlinux/dhcpd-dns-pxe/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/dhcpd-dns-pxe?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/dhcpd-dns-pxe "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/dhcpd-dns-pxe/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/dhcpd-dns-pxe?sort=date)](https://hub.docker.com/r/instantlinux/dhcpd-dns-pxe/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/dhcpd-dns-pxe?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/dhcpd-dns-pxe "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/dhcpd-dns-pxe/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/dhcpd-dns-pxe) Serve DNS and DHCP from one or more small Alpine Linux container(s). This supplies DNS and tftp (for network PXE booting) using dnsmasq, and DHCP using your choice of kea or dnsmasq. Any of the three services can be enabled or disabled. ISC dhcpd is deprecated by its maintainers, and replaced here with kea in January 2026 starting with tag `3.0.2-r0-2.91-r0`. Look at the subnet and reservation definitions for breaking changes. diff --git a/images/dhcpd-dns-pxe/hooks/add_tags b/images/dhcpd-dns-pxe/hooks/add_tags index 4e9ff757..7f5bcac2 100755 --- a/images/dhcpd-dns-pxe/hooks/add_tags +++ b/images/dhcpd-dns-pxe/hooks/add_tags @@ -1,4 +1,4 @@ #!/bin/sh VER1=$(grep "ARG KEA_VERSION" Dockerfile | cut -d= -f 2) VER2=$(grep "ARG DNSMASQ_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$VER1-$VER2" +echo $VER1-$VER2 diff --git a/images/dhcpd-dns-pxe/hooks/build b/images/dhcpd-dns-pxe/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/dhcpd-dns-pxe/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/dhcpd-dns-pxe/hooks/post_push b/images/dhcpd-dns-pxe/hooks/post_push deleted file mode 100755 index 8ebddcac..00000000 --- a/images/dhcpd-dns-pxe/hooks/post_push +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -VER1=$(grep "ARG KEA_VERSION" Dockerfile | cut -d= -f 2) -VER2=$(grep "ARG DNSMASQ_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$VER1-$VER2 -docker push $DOCKER_REPO:$VER1-$VER2 diff --git a/images/dovecot/Dockerfile b/images/dovecot/Dockerfile index fa150a3a..cee649b7 100644 --- a/images/dovecot/Dockerfile +++ b/images/dovecot/Dockerfile @@ -3,12 +3,13 @@ FROM instantlinux/postfix:3.11.4-r0 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.license=Apache-2.0 \ org.label-schema.name=dovecot \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools -ARG DOVECOT_VERSION=2.4.3-r2 +ARG DOVECOT_VERSION=2.4.4-r0 ARG PROCMAIL_VERSION=3.22-r4 ARG MKCERT_SHA=d1efad065f9ef34da372847ff4a4d5ffd86b97410b303d8a43ea25aa2119c86d ARG PROCMAIL_SHA=4ac9f21c3d7dbed5b32e7547da39f4d429de480679b4c856026caea39ca842f9 diff --git a/images/dovecot/README.md b/images/dovecot/README.md index c1874358..88b8edde 100644 --- a/images/dovecot/README.md +++ b/images/dovecot/README.md @@ -1,5 +1,5 @@ ## dovecot -[![](https://img.shields.io/docker/v/instantlinux/dovecot?sort=date)](https://hub.docker.com/r/instantlinux/dovecot/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/dovecot?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/dovecot "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/dovecot/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/dovecot?sort=date)](https://hub.docker.com/r/instantlinux/dovecot/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/dovecot?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/dovecot "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/dovecot/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/dovecot) The dovecot imapd daemon in a small Alpine Linux container, with postfix for local delivery and procmail for filtering. diff --git a/images/dovecot/hooks/add_tags b/images/dovecot/hooks/add_tags index 1d82011b..b186bf6e 100755 --- a/images/dovecot/hooks/add_tags +++ b/images/dovecot/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep -m 1 "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep -m 1 "ARG .*_VERSION" Dockerfile | cut -d= -f 2) diff --git a/images/dovecot/hooks/build b/images/dovecot/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/dovecot/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/dovecot/hooks/post_push b/images/dovecot/hooks/post_push deleted file mode 100755 index fc843c18..00000000 --- a/images/dovecot/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/ez-ipupdate/Dockerfile b/images/ez-ipupdate/Dockerfile index 41b5012c..a80733a4 100644 --- a/images/ez-ipupdate/Dockerfile +++ b/images/ez-ipupdate/Dockerfile @@ -2,6 +2,7 @@ FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=GPL-2.0 \ org.label-schema.name=ez-ipupdate \ diff --git a/images/ez-ipupdate/README.md b/images/ez-ipupdate/README.md index 193d4b56..acd33286 100644 --- a/images/ez-ipupdate/README.md +++ b/images/ez-ipupdate/README.md @@ -1,5 +1,5 @@ ## ez-ipupdate -[![](https://img.shields.io/docker/v/instantlinux/ez-ipupdate?sort=date)](https://hub.docker.com/r/instantlinux/ez-ipupdate/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/ez-ipupdate?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/ez-ipupdate "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/ez-ipupdate/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/ez-ipupdate?sort=date)](https://hub.docker.com/r/instantlinux/ez-ipupdate/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/ez-ipupdate?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/ez-ipupdate "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/ez-ipupdate/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/ez-ipupdate) Dynamic-DNS client - automatically updates a public DNS name with your dynamic IP address. Set this up under Kubernetes or Docker Swarm to ensure it's always running. diff --git a/images/ez-ipupdate/hooks/add_tags b/images/ez-ipupdate/hooks/add_tags index 303d1afe..ff9ebf1d 100755 --- a/images/ez-ipupdate/hooks/add_tags +++ b/images/ez-ipupdate/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) diff --git a/images/ez-ipupdate/hooks/build b/images/ez-ipupdate/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/ez-ipupdate/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/ez-ipupdate/hooks/post_push b/images/ez-ipupdate/hooks/post_push deleted file mode 100755 index fc843c18..00000000 --- a/images/ez-ipupdate/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/git-dump/Dockerfile b/images/git-dump/Dockerfile index 0b80cd36..03e026f2 100644 --- a/images/git-dump/Dockerfile +++ b/images/git-dump/Dockerfile @@ -2,6 +2,7 @@ FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=GPL-2.0 \ org.label-schema.name=git-dump \ diff --git a/images/git-dump/README.md b/images/git-dump/README.md index 0301e11a..acad7fe1 100644 --- a/images/git-dump/README.md +++ b/images/git-dump/README.md @@ -1,5 +1,5 @@ ## git-dump -[![](https://img.shields.io/docker/v/instantlinux/git-dump?sort=date)](https://hub.docker.com/r/instantlinux/git-dump/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/git-dump?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/git-dump "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/git-dump/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/git-dump?sort=date)](https://hub.docker.com/r/instantlinux/git-dump/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/git-dump?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/git-dump "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/git-dump/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/git-dump) This dockerizes a simple script I wrote years ago to create git bundle backups of a private git server. diff --git a/images/git-dump/hooks/add_tags b/images/git-dump/hooks/add_tags index 303d1afe..ff9ebf1d 100755 --- a/images/git-dump/hooks/add_tags +++ b/images/git-dump/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) diff --git a/images/git-dump/hooks/build b/images/git-dump/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/git-dump/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/git-dump/hooks/post_push b/images/git-dump/hooks/post_push deleted file mode 100755 index fc843c18..00000000 --- a/images/git-dump/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/git-pull/Dockerfile b/images/git-pull/Dockerfile index 5df07c3f..7dcf8b19 100644 --- a/images/git-pull/Dockerfile +++ b/images/git-pull/Dockerfile @@ -2,6 +2,7 @@ FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=GPL-2.0 \ org.label-schema.name=git-pull \ diff --git a/images/git-pull/README.md b/images/git-pull/README.md index afa2732d..0afd0d31 100644 --- a/images/git-pull/README.md +++ b/images/git-pull/README.md @@ -1,5 +1,5 @@ ## git-pull -[![](https://img.shields.io/docker/v/instantlinux/git-pull?sort=date)](https://hub.docker.com/r/instantlinux/git-pull/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/git-pull?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/git-pull "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/git-pull/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/git-pull?sort=date)](https://hub.docker.com/r/instantlinux/git-pull/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/git-pull?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/git-pull "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/git-pull/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/git-pull) Git pull, plain and simple (why wasn't there already a published container to do this?) - with multi-architecture support. diff --git a/images/git-pull/hooks/add_tags b/images/git-pull/hooks/add_tags index b0629578..21f456f9 100755 --- a/images/git-pull/hooks/add_tags +++ b/images/git-pull/hooks/add_tags @@ -1,4 +1,2 @@ #!/bin/sh # -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" diff --git a/images/git-pull/hooks/build b/images/git-pull/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/git-pull/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/git-pull/hooks/post_push b/images/git-pull/hooks/post_push deleted file mode 100755 index fc843c18..00000000 --- a/images/git-pull/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/haproxy-keepalived/Dockerfile b/images/haproxy-keepalived/Dockerfile index 4a0c8005..7f908391 100644 --- a/images/haproxy-keepalived/Dockerfile +++ b/images/haproxy-keepalived/Dockerfile @@ -2,6 +2,7 @@ FROM haproxy:3.3.11-alpine ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=GPL-2.0 \ org.label-schema.name=haproxy-keepalived \ diff --git a/images/haproxy-keepalived/README.md b/images/haproxy-keepalived/README.md index 8d76fdff..85a14458 100644 --- a/images/haproxy-keepalived/README.md +++ b/images/haproxy-keepalived/README.md @@ -1,5 +1,5 @@ ## haproxy-keepalived -[![](https://img.shields.io/docker/v/instantlinux/haproxy-keepalived?sort=date)](https://hub.docker.com/r/instantlinux/haproxy-keepalived/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/haproxy-keepalived?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/haproxy-keepalived "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/haproxy-keepalived/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/haproxy-keepalived?sort=date)](https://hub.docker.com/r/instantlinux/haproxy-keepalived/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/haproxy-keepalived?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/haproxy-keepalived "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/haproxy-keepalived/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/haproxy-keepalived) A load balancer with haproxy and keepalived (VRRP) to provide high-availability networking. diff --git a/images/haproxy-keepalived/hooks/add_tags b/images/haproxy-keepalived/hooks/add_tags index 6f25457d..8dcef4cb 100755 --- a/images/haproxy-keepalived/hooks/add_tags +++ b/images/haproxy-keepalived/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep FROM Dockerfile | cut -d: -f 2)-$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep FROM Dockerfile | cut -d: -f 2)-$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) diff --git a/images/haproxy-keepalived/hooks/build b/images/haproxy-keepalived/hooks/build deleted file mode 100755 index 1af968ae..00000000 --- a/images/haproxy-keepalived/hooks/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -docker build -t $IMAGE_NAME . \ - --build-arg VCS_REF=$(git rev-parse HEAD) \ - --build-arg BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) diff --git a/images/haproxy-keepalived/hooks/post_push b/images/haproxy-keepalived/hooks/post_push deleted file mode 100755 index 983e0e4c..00000000 --- a/images/haproxy-keepalived/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep FROM Dockerfile | cut -d: -f 2)-$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/il-v1/hooks/build b/images/il-v1/hooks/build deleted file mode 100755 index 1af968ae..00000000 --- a/images/il-v1/hooks/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -docker build -t $IMAGE_NAME . \ - --build-arg VCS_REF=$(git rev-parse HEAD) \ - --build-arg BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) diff --git a/images/mariadb-galera/Dockerfile b/images/mariadb-galera/Dockerfile index 62c15ab0..2e23d385 100644 --- a/images/mariadb-galera/Dockerfile +++ b/images/mariadb-galera/Dockerfile @@ -2,6 +2,7 @@ FROM mariadb:12.3.2 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=GPL-2.0 \ org.label-schema.name=mariadb-galera \ diff --git a/images/mariadb-galera/README.md b/images/mariadb-galera/README.md index 9c00edf5..b06aadf2 100644 --- a/images/mariadb-galera/README.md +++ b/images/mariadb-galera/README.md @@ -1,5 +1,5 @@ ## mariadb-galera -[![](https://img.shields.io/docker/v/instantlinux/mariadb-galera?sort=date)](https://hub.docker.com/r/instantlinux/mariadb-galera/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/mariadb-galera?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/mariadb-galera "Image badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/mariadb-galera/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/mariadb-galera?sort=date)](https://hub.docker.com/r/instantlinux/mariadb-galera/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/mariadb-galera?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/mariadb-galera "Image badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/mariadb-galera/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/mariadb-galera) MariaDB 12.x with automatic cluster generation under kubernetes / swarm using named volumes for data persistence. This has robust bootstrap logic based on MariaDB / Galera documentation for automated cluster create / join operations. Requires an etcd instance for sharing instance-health data across the cluster. diff --git a/images/mariadb-galera/hooks/add_tags b/images/mariadb-galera/hooks/add_tags index 524df427..638db0e5 100755 --- a/images/mariadb-galera/hooks/add_tags +++ b/images/mariadb-galera/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "FROM mariadb:" Dockerfile | cut -d: -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "FROM mariadb:" Dockerfile | cut -d: -f 2) diff --git a/images/mariadb-galera/hooks/build b/images/mariadb-galera/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/mariadb-galera/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/mariadb-galera/hooks/post_push b/images/mariadb-galera/hooks/post_push deleted file mode 100644 index fc843c18..00000000 --- a/images/mariadb-galera/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/mysqldump/Dockerfile b/images/mysqldump/Dockerfile index 1550dd5f..bd145384 100644 --- a/images/mysqldump/Dockerfile +++ b/images/mysqldump/Dockerfile @@ -2,6 +2,7 @@ FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.license=Apache-2.0 \ org.label-schema.name=mysqldump \ org.label-schema.vcs-ref=$VCS_REF \ diff --git a/images/mysqldump/README.md b/images/mysqldump/README.md index 887ff558..f25d1255 100644 --- a/images/mysqldump/README.md +++ b/images/mysqldump/README.md @@ -1,5 +1,5 @@ ## mysqldump -[![](https://img.shields.io/docker/v/instantlinux/mysqldump?sort=date)](https://hub.docker.com/r/instantlinux/mysqldump/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/mysqldump?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/mysqldump "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/mysqldump/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/mysqldump?sort=date)](https://hub.docker.com/r/instantlinux/mysqldump/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/mysqldump?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/mysqldump "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/mysqldump/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/mysqldump) This dockerizes a simple script I wrote in 2008 to perform a daily dump of the MySQL databases in a Percona Galera cluster. This image is based on diff --git a/images/mysqldump/hooks/add_tags b/images/mysqldump/hooks/add_tags index 303d1afe..ff9ebf1d 100755 --- a/images/mysqldump/hooks/add_tags +++ b/images/mysqldump/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) diff --git a/images/mysqldump/hooks/build b/images/mysqldump/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/mysqldump/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/mysqldump/hooks/post_push b/images/mysqldump/hooks/post_push deleted file mode 100755 index fc843c18..00000000 --- a/images/mysqldump/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/mythtv-backend/Dockerfile b/images/mythtv-backend/Dockerfile index dc0b6b7f..62f4bb93 100644 --- a/images/mythtv-backend/Dockerfile +++ b/images/mythtv-backend/Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu:resolute ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.license=GPL-2.0 \ org.label-schema.name=mythtv-backend \ org.label-schema.vcs-ref=$VCS_REF \ @@ -19,7 +20,7 @@ ENV DBNAME=mythtv \ ARG MYTHTV_GID=100 ARG MYTHTV_UID=2021 ARG MYTHTV_PPA=ppa:mythbuntu/36 -ARG MYTHTV_VERSION=2:36.0+fixes.202607020123.7153bb6e34~ubuntu26.04.1 +ARG MYTHTV_VERSION=2:36.0+fixes.202608010335.0d263282c8~ubuntu26.04.1 ARG MYTHLINK_SHA=459cb8b60adae4b631a95a9cfb1b41dcb959cc4a0b9053582a711d58b8d8a0d2 RUN \ diff --git a/images/mythtv-backend/README.md b/images/mythtv-backend/README.md index 1793aa82..9f9f9fc5 100644 --- a/images/mythtv-backend/README.md +++ b/images/mythtv-backend/README.md @@ -1,7 +1,7 @@ ## mythtv-backend -[![](https://img.shields.io/docker/v/instantlinux/mythtv-backend?sort=date)](https://hub.docker.com/r/instantlinux/mythtv-backend/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/mythtv-backend?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/mythtv-backend "Image badge") ![](https://img.shields.io/badge/platform-amd64-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/mythtv-backend/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/mythtv-backend?sort=date)](https://hub.docker.com/r/instantlinux/mythtv-backend/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/mythtv-backend?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/mythtv-backend "Image badge") ![](https://img.shields.io/badge/platform-amd64-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/mythtv-backend/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/mythtv-backend) -The MythTV backend built under Ubuntu noble (24.04). +The MythTV backend built under Ubuntu resolute (26.04). ### Usage diff --git a/images/mythtv-backend/hooks/add_tags b/images/mythtv-backend/hooks/add_tags index 327385bc..081cf56e 100755 --- a/images/mythtv-backend/hooks/add_tags +++ b/images/mythtv-backend/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "ARG .*_VERSION" Dockerfile | grep -o '[1-9][0-9].[0-9+]+fixes\.[0-9]*.[0-9a-f]*' | tr + -) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "ARG .*_VERSION" Dockerfile | grep -o '[1-9][0-9].[0-9+]+fixes\.[0-9]*.[0-9a-f]*' | tr + -) diff --git a/images/mythtv-backend/hooks/build b/images/mythtv-backend/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/mythtv-backend/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/mythtv-backend/hooks/post_push b/images/mythtv-backend/hooks/post_push deleted file mode 100755 index 9683874f..00000000 --- a/images/mythtv-backend/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG .*_VERSION" Dockerfile | grep -oP '(?<=ION=2:).*(?=[+~])' | tr + -) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/nagios/Dockerfile b/images/nagios/Dockerfile index dfb52279..1f3ad812 100644 --- a/images/nagios/Dockerfile +++ b/images/nagios/Dockerfile @@ -2,6 +2,7 @@ FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.license=GPL-2.0 \ org.label-schema.name=nagios \ org.label-schema.vcs-ref=$VCS_REF \ diff --git a/images/nagios/README.md b/images/nagios/README.md index 6d1f344b..7dd75870 100644 --- a/images/nagios/README.md +++ b/images/nagios/README.md @@ -1,5 +1,5 @@ ## nagios -[![](https://img.shields.io/docker/v/instantlinux/nagios?sort=date)](https://hub.docker.com/r/instantlinux/nagios/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/nagios?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/nagios "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/nagios/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/nagios?sort=date)](https://hub.docker.com/r/instantlinux/nagios/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/nagios?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/nagios "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/nagios/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/nagios) Nagios Core monitoring service built under Alpine for multiple platforms diff --git a/images/nagios/hooks/add_tags b/images/nagios/hooks/add_tags index 20dc3ac3..10371dc0 100755 --- a/images/nagios/hooks/add_tags +++ b/images/nagios/hooks/add_tags @@ -1,4 +1,4 @@ #!/bin/sh VER1=$(grep "ARG NAGIOS_VERSION" Dockerfile | grep -Eo '[0-9\.]{3,20}') VER2=$(grep "ARG PLUGINS_VERSION" Dockerfile | grep -Eo '[0-9\.]{3,20}') -echo "--tag $DOCKER_REPO:$VER1-$VER2" +echo $VER1-$VER2 diff --git a/images/nagiosql/Dockerfile b/images/nagiosql/Dockerfile index d89b7fa1..78a195f8 100644 --- a/images/nagiosql/Dockerfile +++ b/images/nagiosql/Dockerfile @@ -2,6 +2,7 @@ FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.license=Apache-2.0 \ org.label-schema.name=nagiosql \ org.label-schema.vcs-ref=$VCS_REF \ diff --git a/images/nagiosql/README.md b/images/nagiosql/README.md index bac8ac11..e41c472d 100644 --- a/images/nagiosql/README.md +++ b/images/nagiosql/README.md @@ -1,5 +1,5 @@ ## nagiosql -[![](https://img.shields.io/docker/v/instantlinux/nagiosql?sort=date)](https://hub.docker.com/r/instantlinux/nagiosql/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/nagiosql?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/nagiosql "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/nagiosql/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/nagiosql?sort=date)](https://hub.docker.com/r/instantlinux/nagiosql/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/nagiosql?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/nagiosql "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/nagiosql/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/nagiosql) Web GUI for managing Nagios monitoring service. diff --git a/images/nagiosql/hooks/add_tags b/images/nagiosql/hooks/add_tags index 38615240..436290e5 100755 --- a/images/nagiosql/hooks/add_tags +++ b/images/nagiosql/hooks/add_tags @@ -1,4 +1,4 @@ #!/bin/sh VER1=$(grep "^ARG NAGIOSQL_VERSION" Dockerfile | cut -d= -f 2) VER2=$(grep "ARG NAGIOS_VERSION" Dockerfile | grep -Eo '[0-9\.]{3,20}') -echo "--tag $DOCKER_REPO:$VER1-$VER2" +echo $VER1-$VER2 diff --git a/images/nagiosql/hooks/build b/images/nagiosql/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/nagiosql/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/nagiosql/hooks/post_push b/images/nagiosql/hooks/post_push deleted file mode 100755 index 371279c6..00000000 --- a/images/nagiosql/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "^ARG NAGIOSQL_VERSION=" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/nut-upsd/Dockerfile b/images/nut-upsd/Dockerfile index aa1567a4..e4f2b373 100644 --- a/images/nut-upsd/Dockerfile +++ b/images/nut-upsd/Dockerfile @@ -2,6 +2,7 @@ FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=GPL-2.0 \ org.label-schema.name=nut-upsd \ diff --git a/images/nut-upsd/README.md b/images/nut-upsd/README.md index 2b653fab..e27e181c 100644 --- a/images/nut-upsd/README.md +++ b/images/nut-upsd/README.md @@ -1,5 +1,5 @@ ## nut-upsd -[![](https://img.shields.io/docker/v/instantlinux/nut-upsd?sort=date)](https://hub.docker.com/r/instantlinux/nut-upsd/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/nut-upsd?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/nut-upsd "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/nut-upsd/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/nut-upsd?sort=date)](https://hub.docker.com/r/instantlinux/nut-upsd/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/nut-upsd?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/nut-upsd "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/nut-upsd/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/nut-upsd) The Network UPS Tools (nut) package in an Alpine container, with enough configuration to support Nagios monitoring of your UPS units. This multi-architecture image supports Intel/AMD and ARM (Raspberry Pi etc). diff --git a/images/nut-upsd/hooks/add_tags b/images/nut-upsd/hooks/add_tags index 303d1afe..ff9ebf1d 100755 --- a/images/nut-upsd/hooks/add_tags +++ b/images/nut-upsd/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) diff --git a/images/nut-upsd/hooks/build b/images/nut-upsd/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/nut-upsd/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/nut-upsd/hooks/post_push b/images/nut-upsd/hooks/post_push deleted file mode 100755 index fc843c18..00000000 --- a/images/nut-upsd/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/openldap/Dockerfile b/images/openldap/Dockerfile index 7b99a9cf..7ea2b185 100644 --- a/images/openldap/Dockerfile +++ b/images/openldap/Dockerfile @@ -2,6 +2,7 @@ FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=GPL-3.0 \ org.label-schema.name=openldap \ diff --git a/images/openldap/README.md b/images/openldap/README.md index d7cea9b4..c97c56b0 100644 --- a/images/openldap/README.md +++ b/images/openldap/README.md @@ -1,5 +1,5 @@ ## openldap -[![](https://img.shields.io/docker/v/instantlinux/openldap?sort=date)](https://hub.docker.com/r/instantlinux/openldap/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/openldap?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/openldap "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/openldap/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/openldap?sort=date)](https://hub.docker.com/r/instantlinux/openldap/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/openldap?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/openldap "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/openldap/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/openldap) This is OpenLDAP in a tiny alpine container, with simple setup. All features and capabilities are supported. diff --git a/images/openldap/hooks/add_tags b/images/openldap/hooks/add_tags index 303d1afe..ff9ebf1d 100755 --- a/images/openldap/hooks/add_tags +++ b/images/openldap/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) diff --git a/images/openldap/hooks/build b/images/openldap/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/openldap/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/openldap/hooks/post_push b/images/openldap/hooks/post_push deleted file mode 100755 index fc843c18..00000000 --- a/images/openldap/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/postfix-python/Dockerfile b/images/postfix-python/Dockerfile index cfcdb5c6..0d3947ee 100644 --- a/images/postfix-python/Dockerfile +++ b/images/postfix-python/Dockerfile @@ -1,9 +1,10 @@ -ARG POSTFIX_VERSION=3.11.4-r0 +ARG POSTFIX_VERSION=3.11.5-r0 FROM instantlinux/postfix:$POSTFIX_VERSION ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=IPL-1.0 \ org.label-schema.name=postfix-python \ diff --git a/images/postfix-python/README.md b/images/postfix-python/README.md index aaeb096c..f503fcfb 100644 --- a/images/postfix-python/README.md +++ b/images/postfix-python/README.md @@ -1,5 +1,5 @@ ## postfix-python -[![](https://img.shields.io/docker/v/instantlinux/postfix-python?sort=date)](https://hub.docker.com/r/instantlinux/postfix-python/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/postfix-python?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/postfix-python "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20aarch64-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/postfix-python/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/postfix-python?sort=date)](https://hub.docker.com/r/instantlinux/postfix-python/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/postfix-python?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/postfix-python "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20aarch64-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/postfix-python/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/postfix-python) Postfix with python support. (Python needed for blacklist utility.) This repo has complete instructions for [building a kubernetes cluster](https://github.com/instantlinux/docker-tools/blob/main/k8s/README.md) where you can launch with [helm](https://github.com/instantlinux/docker-tools/tree/main/images/postfix-python/helm) or [kubernetes.yaml](https://github.com/instantlinux/docker-tools/blob/main/images/postfix-python/kubernetes.yaml) using _make_ and customizing [Makefile.vars](https://github.com/instantlinux/docker-tools/blob/main/k8s/Makefile.vars) after cloning this repo: diff --git a/images/postfix-python/hooks/add_tags b/images/postfix-python/hooks/add_tags index 0c75cb3f..f796b635 100755 --- a/images/postfix-python/hooks/add_tags +++ b/images/postfix-python/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "ARG POSTFIX_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "ARG POSTFIX_VERSION" Dockerfile | cut -d= -f 2) diff --git a/images/postfix-python/hooks/build b/images/postfix-python/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/postfix-python/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/postfix-python/hooks/post_push b/images/postfix-python/hooks/post_push deleted file mode 100644 index 1bbaf78a..00000000 --- a/images/postfix-python/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG POSTFIX_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/postfix/Dockerfile b/images/postfix/Dockerfile index 0943c8e7..ea6776ce 100644 --- a/images/postfix/Dockerfile +++ b/images/postfix/Dockerfile @@ -2,12 +2,13 @@ FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=IPL-1.0 \ org.label-schema.name=postfix \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools -ARG POSTFIX_VERSION=3.11.4-r0 +ARG POSTFIX_VERSION=3.11.5-r0 ENV SASL_SECRETNAME=postfix-sasl-passwd \ TZ=UTC diff --git a/images/postfix/README.md b/images/postfix/README.md index 883f1f49..ad34896b 100644 --- a/images/postfix/README.md +++ b/images/postfix/README.md @@ -1,5 +1,5 @@ ## postfix -[![](https://img.shields.io/docker/v/instantlinux/postfix?sort=date)](https://hub.docker.com/r/instantlinux/postfix/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/postfix?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/postfix "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/postfix/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/postfix?sort=date)](https://hub.docker.com/r/instantlinux/postfix/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/postfix?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/postfix "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/postfix/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/postfix) The postfix daemon in a small Alpine Linux container, with client support for separate spamassassin container. This is a layer which supports related image [postfix-python](https://hub.docker.com/r/instantlinux/postfix-python). diff --git a/images/postfix/hooks/add_tags b/images/postfix/hooks/add_tags index 303d1afe..ff9ebf1d 100755 --- a/images/postfix/hooks/add_tags +++ b/images/postfix/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) diff --git a/images/postfix/hooks/build b/images/postfix/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/postfix/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/postfix/hooks/post_push b/images/postfix/hooks/post_push deleted file mode 100755 index fc843c18..00000000 --- a/images/postfix/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/proftpd/Dockerfile b/images/proftpd/Dockerfile index d37a3842..cd7102f5 100644 --- a/images/proftpd/Dockerfile +++ b/images/proftpd/Dockerfile @@ -2,13 +2,14 @@ FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=GPL-2.0 \ org.label-schema.name=proftpd \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools -ARG PROFTPD_VERSION=1.3.9b-r1 +ARG PROFTPD_VERSION=1.3.9c-r1 ENV ALLOW_OVERWRITE=on \ ANONYMOUS_DISABLE=off \ diff --git a/images/proftpd/README.md b/images/proftpd/README.md index dd63b26f..a4640290 100644 --- a/images/proftpd/README.md +++ b/images/proftpd/README.md @@ -1,5 +1,5 @@ ## proftpd -[![](https://img.shields.io/docker/v/instantlinux/proftpd?sort=date)](https://hub.docker.com/r/instantlinux/proftpd/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/proftpd?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/proftpd "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/proftpd/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/proftpd?sort=date)](https://hub.docker.com/r/instantlinux/proftpd/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/proftpd?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/proftpd "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/proftpd/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/proftpd) An easy-to-use, tiny yet full-featured installation of ProFTPD. diff --git a/images/proftpd/hooks/add_tags b/images/proftpd/hooks/add_tags index 303d1afe..ff9ebf1d 100755 --- a/images/proftpd/hooks/add_tags +++ b/images/proftpd/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) diff --git a/images/proftpd/hooks/build b/images/proftpd/hooks/build deleted file mode 100755 index 1af968ae..00000000 --- a/images/proftpd/hooks/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -docker build -t $IMAGE_NAME . \ - --build-arg VCS_REF=$(git rev-parse HEAD) \ - --build-arg BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) diff --git a/images/proftpd/hooks/post_push b/images/proftpd/hooks/post_push deleted file mode 100755 index fc843c18..00000000 --- a/images/proftpd/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/rsyslogd/Dockerfile b/images/rsyslogd/Dockerfile index c3abd6ba..3e82a72e 100644 --- a/images/rsyslogd/Dockerfile +++ b/images/rsyslogd/Dockerfile @@ -2,6 +2,7 @@ FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.license=GPL-3.0 \ org.label-schema.name=rsyslogd \ org.label-schema.vcs-ref=$VCS_REF \ diff --git a/images/rsyslogd/README.md b/images/rsyslogd/README.md index b46b4398..2669f0be 100644 --- a/images/rsyslogd/README.md +++ b/images/rsyslogd/README.md @@ -1,5 +1,5 @@ ## rsyslogd -[![](https://img.shields.io/docker/v/instantlinux/rsyslogd?sort=date)](https://hub.docker.com/r/instantlinux/rsyslogd/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/rsyslogd?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/rsyslogd "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/rsyslogd/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/rsyslogd?sort=date)](https://hub.docker.com/r/instantlinux/rsyslogd/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/rsyslogd?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/rsyslogd "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/rsyslogd/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/rsyslogd) Run your central rsyslog in a high-availability container on top of shared storage. Then send all that into Splunk or wherever. diff --git a/images/rsyslogd/hooks/add_tags b/images/rsyslogd/hooks/add_tags index 303d1afe..ff9ebf1d 100755 --- a/images/rsyslogd/hooks/add_tags +++ b/images/rsyslogd/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) diff --git a/images/rsyslogd/hooks/build b/images/rsyslogd/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/rsyslogd/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/rsyslogd/hooks/post_push b/images/rsyslogd/hooks/post_push deleted file mode 100755 index fc843c18..00000000 --- a/images/rsyslogd/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/samba-dc/Dockerfile b/images/samba-dc/Dockerfile index a768c3f0..653269c2 100644 --- a/images/samba-dc/Dockerfile +++ b/images/samba-dc/Dockerfile @@ -2,6 +2,7 @@ FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=GPL-3.0 \ org.label-schema.name=samba-dc \ diff --git a/images/samba-dc/README.md b/images/samba-dc/README.md index 7585ffb9..a86cce53 100644 --- a/images/samba-dc/README.md +++ b/images/samba-dc/README.md @@ -1,5 +1,5 @@ ## samba-dc -[![](https://img.shields.io/docker/v/instantlinux/samba-dc?sort=date)](https://hub.docker.com/r/instantlinux/samba-dc/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/samba-dc?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/samba-dc "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/samba/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/samba-dc?sort=date)](https://hub.docker.com/r/instantlinux/samba-dc/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/samba-dc?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/samba-dc "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/samba/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/samba-dc) Samba domain controller. diff --git a/images/samba-dc/hooks/add_tags b/images/samba-dc/hooks/add_tags index 303d1afe..ff9ebf1d 100755 --- a/images/samba-dc/hooks/add_tags +++ b/images/samba-dc/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) diff --git a/images/samba-dc/hooks/build b/images/samba-dc/hooks/build deleted file mode 100755 index 1af968ae..00000000 --- a/images/samba-dc/hooks/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -docker build -t $IMAGE_NAME . \ - --build-arg VCS_REF=$(git rev-parse HEAD) \ - --build-arg BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) diff --git a/images/samba-dc/hooks/post_push b/images/samba-dc/hooks/post_push deleted file mode 100755 index fc843c18..00000000 --- a/images/samba-dc/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/samba/Dockerfile b/images/samba/Dockerfile index f5c291fd..65841dab 100644 --- a/images/samba/Dockerfile +++ b/images/samba/Dockerfile @@ -2,6 +2,7 @@ FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=GPL-3.0 \ org.label-schema.name=samba \ diff --git a/images/samba/README.md b/images/samba/README.md index d06d9b78..bf0d0dae 100644 --- a/images/samba/README.md +++ b/images/samba/README.md @@ -1,5 +1,5 @@ ## samba -[![](https://img.shields.io/docker/v/instantlinux/samba?sort=date)](https://hub.docker.com/r/instantlinux/samba/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/samba?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/samba "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/samba/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/samba?sort=date)](https://hub.docker.com/r/instantlinux/samba/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/samba?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/samba "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/samba/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/samba) Samba as a file server. This is stripped down to the basics to enable greatest flexibility. Supported on multiple architectures. diff --git a/images/samba/hooks/add_tags b/images/samba/hooks/add_tags index 303d1afe..ff9ebf1d 100755 --- a/images/samba/hooks/add_tags +++ b/images/samba/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) diff --git a/images/samba/hooks/build b/images/samba/hooks/build deleted file mode 100755 index 253faaca..00000000 --- a/images/samba/hooks/build +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -DOCKERFILE_OPT= -if [[ $DOCKER_REPO == *-armhf ]]; then - DOCKERFILE_OPT="-f Dockerfile.armhf" -elif [[ $DOCKER_REPO == *-arm64 ]]; then - DOCKERFILE_OPT="-f Dockerfile.arm64" -elif [[ $DOCKER_REPO == *-arm32 ]]; then - DOCKERFILE_OPT="-f Dockerfile.arm32" -fi -docker build -t $IMAGE_NAME $DOCKERFILE_OPT . \ - --build-arg VCS_REF=$(git rev-parse HEAD) \ - --build-arg BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) diff --git a/images/samba/hooks/post_push b/images/samba/hooks/post_push deleted file mode 100755 index fc843c18..00000000 --- a/images/samba/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/spamassassin/Dockerfile b/images/spamassassin/Dockerfile index bb6935a1..18874bc5 100644 --- a/images/spamassassin/Dockerfile +++ b/images/spamassassin/Dockerfile @@ -2,6 +2,7 @@ FROM debian:trixie-slim ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=Apache-2.0 \ org.label-schema.name=spamassassin \ diff --git a/images/spamassassin/README.md b/images/spamassassin/README.md index 5dfdb081..9fd873e2 100644 --- a/images/spamassassin/README.md +++ b/images/spamassassin/README.md @@ -1,5 +1,5 @@ ## spamassassin -[![](https://img.shields.io/docker/v/instantlinux/spamassassin?sort=date)](https://hub.docker.com/r/instantlinux/spamassassin/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/spamassassin?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/spamassassin "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/spamassassin/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/spamassassin?sort=date)](https://hub.docker.com/r/instantlinux/spamassassin/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/spamassassin?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/spamassassin "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/spamassassin/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/spamassassin) This image includes pyzor, razor2 and dcc (with proper initialization of razor2 upon container start). The rules update can be scheduled to run at an diff --git a/images/spamassassin/hooks/add_tags b/images/spamassassin/hooks/add_tags index 8cc88917..9ca66181 100755 --- a/images/spamassassin/hooks/add_tags +++ b/images/spamassassin/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "ARG SPAMD_VERSION" Dockerfile | cut -d= -f 2 | cut -d '~' -f 1) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "ARG SPAMD_VERSION" Dockerfile | cut -d= -f 2 | cut -d '~' -f 1) diff --git a/images/spamassassin/hooks/build b/images/spamassassin/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/spamassassin/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/spamassassin/hooks/post_push b/images/spamassassin/hooks/post_push deleted file mode 100755 index 656a7f11..00000000 --- a/images/spamassassin/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG SPAMD_VERSION" Dockerfile | grep -oP '(?<=ION=).*(?=[+~])') -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/squirrelmail/hooks/build b/images/squirrelmail/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/squirrelmail/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/udp-nginx-proxy/Dockerfile b/images/udp-nginx-proxy/Dockerfile index 3507646c..75108745 100644 --- a/images/udp-nginx-proxy/Dockerfile +++ b/images/udp-nginx-proxy/Dockerfile @@ -2,6 +2,7 @@ FROM nginx:1.27.4-alpine ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=Apache-2.0 \ org.label-schema.name=udp-nginx-proxy \ diff --git a/images/udp-nginx-proxy/README.md b/images/udp-nginx-proxy/README.md index bcc0052f..566dfa27 100644 --- a/images/udp-nginx-proxy/README.md +++ b/images/udp-nginx-proxy/README.md @@ -1,5 +1,5 @@ ## udp-nginx-proxy -[![](https://img.shields.io/docker/v/instantlinux/udp-nginx-proxy?sort=date)](https://hub.docker.com/r/instantlinux/udp-nginx-proxy/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/udp-nginx-proxy?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/udp-nginx-proxy "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/udp-nginx-proxy/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/udp-nginx-proxy?sort=date)](https://hub.docker.com/r/instantlinux/udp-nginx-proxy/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/udp-nginx-proxy?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/udp-nginx-proxy "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/udp-nginx-proxy/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/udp-nginx-proxy) The missing feature of haproxy: UDP, provided by nginx. The main use-case for this is to make more than one DNS server available at a diff --git a/images/udp-nginx-proxy/hooks/add_tags b/images/udp-nginx-proxy/hooks/add_tags index 9a4bf371..53b06b6b 100755 --- a/images/udp-nginx-proxy/hooks/add_tags +++ b/images/udp-nginx-proxy/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "^FROM " Dockerfile |cut -d ':' -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "^FROM " Dockerfile |cut -d ':' -f 2) diff --git a/images/udp-nginx-proxy/hooks/build b/images/udp-nginx-proxy/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/udp-nginx-proxy/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/vsftpd/Dockerfile b/images/vsftpd/Dockerfile index 37a9dee0..f4f8247c 100644 --- a/images/vsftpd/Dockerfile +++ b/images/vsftpd/Dockerfile @@ -2,7 +2,9 @@ FROM alpine:3.23 MAINTAINER Rich Braun "docker@instantlinux.net" ARG BUILD_DATE ARG VCS_REF -LABEL org.label-schema.build-date=$BUILD_DATE \ +LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ + org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=Apache-2.0 \ org.label-schema.name=vsftpd \ org.label-schema.vcs-ref=$VCS_REF \ diff --git a/images/vsftpd/README.md b/images/vsftpd/README.md index 76e022f9..9fe1f1f5 100644 --- a/images/vsftpd/README.md +++ b/images/vsftpd/README.md @@ -1,5 +1,5 @@ ## vsftpd -[![](https://img.shields.io/docker/v/instantlinux/vsftpd?sort=date)](https://hub.docker.com/r/instantlinux/vsftpd/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/vsftpd?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/vsftpd "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/vsftpd/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/vsftpd?sort=date)](https://hub.docker.com/r/instantlinux/vsftpd/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/vsftpd?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/vsftpd "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/vsftpd/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/vsftpd) A clean, easy-to-use, tiny yet full-featured installation of vsftpd wrapped in Alpine. diff --git a/images/vsftpd/hooks/add_tags b/images/vsftpd/hooks/add_tags index 303d1afe..ff9ebf1d 100755 --- a/images/vsftpd/hooks/add_tags +++ b/images/vsftpd/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) diff --git a/images/vsftpd/hooks/build b/images/vsftpd/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/vsftpd/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/vsftpd/hooks/post_push b/images/vsftpd/hooks/post_push deleted file mode 100755 index fc843c18..00000000 --- a/images/vsftpd/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/images/weewx/Dockerfile b/images/weewx/Dockerfile index d4d30ffd..1bc54d72 100644 --- a/images/weewx/Dockerfile +++ b/images/weewx/Dockerfile @@ -2,6 +2,7 @@ FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ + org.opencontainers.image.source=https://github.com/instantlinux/docker-tools \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.license=GPL-3.0 \ org.label-schema.name=weewx \ diff --git a/images/weewx/README.md b/images/weewx/README.md index 6efc5459..a2f71aef 100644 --- a/images/weewx/README.md +++ b/images/weewx/README.md @@ -1,5 +1,5 @@ ## weewx -[![](https://img.shields.io/docker/v/instantlinux/weewx?sort=date)](https://hub.docker.com/r/instantlinux/weewx/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/weewx?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/weewx "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/weewx/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/weewx?sort=date)](https://hub.docker.com/r/instantlinux/weewx/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/weewx?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/weewx "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/weewx/Dockerfile "dockerfile") [![](https://img.shields.io/badge/ghcr-package-blue?logo=github "ghcr badge")](https://github.com/users/instantlinux/packages/container/package/weewx) Weather station software WeeWX diff --git a/images/weewx/hooks/add_tags b/images/weewx/hooks/add_tags index 41d9cdd7..697c724b 100755 --- a/images/weewx/hooks/add_tags +++ b/images/weewx/hooks/add_tags @@ -1,3 +1,2 @@ #!/bin/sh -TAG=$(grep "ARG WEEWX_VERSION" Dockerfile | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" +echo $(grep "ARG WEEWX_VERSION" Dockerfile | cut -d= -f 2) diff --git a/images/weewx/hooks/build b/images/weewx/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/weewx/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/weewx/hooks/post_push b/images/weewx/hooks/post_push deleted file mode 100755 index 596c5dfd..00000000 --- a/images/weewx/hooks/post_push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -TAG=$(grep "ARG WEEWX_VERSION" Dockerfile | cut -d= -f 2) -docker tag $IMAGE_NAME $DOCKER_REPO:$TAG -docker push $DOCKER_REPO:$TAG diff --git a/lib/build/Makefile.docker_image b/lib/build/Makefile.docker_image index 61604a34..51592c79 100644 --- a/lib/build/Makefile.docker_image +++ b/lib/build/Makefile.docker_image @@ -9,7 +9,7 @@ VENV = python_env VDIR = $(PWD)/$(VENV) export IMAGE_NAME = $(REGISTRY)/$(IMAGE):$(TAG) -export DOCKER_REPO = $(USER_LOGIN)/$(IMAGE) +export IMAGE_REPO = $(USER_LOGIN)/$(IMAGE) ifneq ($(CI_COMMIT_TAG),) TAG_OPT = --tag $(USER_LOGIN)$(IMAGE):$(CI_COMMIT_TAG) @@ -57,11 +57,15 @@ create_image: $(HOME)/.docker/cli-plugins/docker-buildx --build-arg=BUILD_DATE=$(shell date +%Y-%m-%dT%H:%M:%SZ) promote_image: $(HOME)/.docker/cli-plugins/docker-buildx - # Log into dockerhub - docker login -u $(USER_LOGIN) -p $(DOCKER_TOKEN) - docker buildx build $(TAG_OPT) \ - `[ -e hooks/add_tags ] && hooks/add_tags` \ - --tag $(USER_LOGIN)/$(IMAGE):latest --platform $(PLATFORMS) \ + # Log into dockerhub and ghcr + echo $(DOCKER_TOKEN) | docker login -u $(USER_LOGIN) --password-stdin + echo $(GHCR_PUBLISH) | docker login -u $(USER_LOGIN) --password-stdin ghcr.io + TAG=$$(hooks/add_tags) && \ + docker buildx build $(TAG_OPT) --platform $(PLATFORMS) \ + --tag $(IMAGE_REPO):latest \ + --tag ghcr.io/$(IMAGE_REPO):latest \ + --tag $(IMAGE_REPO):$$TAG \ + --tag ghcr.io/$(IMAGE_REPO):$$TAG \ --push --file Dockerfile . \ --build-arg=VCS_REF=$(CI_COMMIT_SHA) \ --build-arg=BUILD_DATE=$(shell date +%Y-%m-%dT%H:%M:%SZ) diff --git a/lib/build/dockerhub-hook b/lib/build/dockerhub-hook deleted file mode 100755 index 1af968ae..00000000 --- a/lib/build/dockerhub-hook +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -docker build -t $IMAGE_NAME . \ - --build-arg VCS_REF=$(git rev-parse HEAD) \ - --build-arg BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)