From 0a9e9d3325c68a8e1613c4fb05e6f8a9109e76f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20B=C3=BClow?= Date: Fri, 6 Jan 2023 20:56:00 +0100 Subject: [PATCH] reverted back to debian based container --- Dockerfile | 2 +- Makefile | 12 +++++++++--- ingress-traefik.yml | 39 --------------------------------------- 3 files changed, 10 insertions(+), 43 deletions(-) delete mode 100644 ingress-traefik.yml diff --git a/Dockerfile b/Dockerfile index fb8eb2e..859ed95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,2 @@ -FROM nginx:alpine +FROM nginx:latest COPY public /usr/share/nginx/html diff --git a/Makefile b/Makefile index 89dc05f..9eb1564 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,23 @@ +HEAD=$(shell git rev-parse --short HEAD) dev: hugo server -D static: hugo container: - podman build -t docker.io/jmbitci/www-jmbit-de . + podman build -t docker.io/jmbitci/www-jmbit-de:latest . + podman build -t docker.io/jmbitci/www-jmbit-de:$(HEAD) . publish: - podman push docker.io/jmbitci/www-jmbit-de + podman push docker.io/jmbitci/www-jmbit-de:latest + podman push docker.io/jmbitci/www-jmbit-de:$(HEAD) nopub: static container - podman run --rm docker.io/jmbitci/www-jmbit-de + podman run --rm -p8080:80 docker.io/jmbitci/www-jmbit-de rollout: kubectl rollout restart deployment www-jmbit-de -n jmbit-web +clean: + rm + all: static container publish diff --git a/ingress-traefik.yml b/ingress-traefik.yml deleted file mode 100644 index 170db7a..0000000 --- a/ingress-traefik.yml +++ /dev/null @@ -1,39 +0,0 @@ ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: jmbit-web-ingress - namespace: jmbit-web - annotations: - kubernetes.io/ingress.class: "traefik" - cert-manager.io/issuer: letsencrypt-web - traefik.ingress.kubernetes.io/router.entrypoints: websecure - traefik.ingress.kubernetes.io/router.tls: "true" -spec: - tls: - - secretName: jmbit-web-cert - hosts: - - www.jmbit.de - - jmbit.de - rules: - - host: www.jmbit.de - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: www-jmbit-de-service - port: - number: 80 - - host: jmbit.de - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: www-jmbit-de-service - port: - number: 80 -