From 057c429a5f9c864f1bbcfde07f34c99c2e63ab99 Mon Sep 17 00:00:00 2001 From: Bruce CHEN <805899926@qq.com> Date: Sat, 31 Aug 2024 12:00:18 +0800 Subject: [PATCH] # remove openimage label --- server/docker/app/graalvm-jdk-17/Dockerfile | 5 ----- server/docker/app/hugo/Dockerfile | 5 ----- server/docker/app/jdk-11/Dockerfile | 5 ----- server/docker/app/jdk-17/Dockerfile | 5 ----- server/docker/app/jdk-21/Dockerfile | 5 ----- server/docker/app/mkdoc/Dockerfile | 5 ----- server/docker/ops/jenkins-inbound-agent/Dockerfile | 5 ----- server/docker/ops/jenkins-ssh-agent/Dockerfile | 5 ----- server/docker/ops/jenkins/Dockerfile | 5 ----- 9 files changed, 45 deletions(-) diff --git a/server/docker/app/graalvm-jdk-17/Dockerfile b/server/docker/app/graalvm-jdk-17/Dockerfile index 1e31a55b8..ed5ae56a8 100644 --- a/server/docker/app/graalvm-jdk-17/Dockerfile +++ b/server/docker/app/graalvm-jdk-17/Dockerfile @@ -1,10 +1,5 @@ FROM ghcr.io/graalvm/graalvm-community:17.0.9-ol7-20231024 -LABEL org.opencontainers.image.url='https://github.com/czy21/container' -LABEL org.opencontainers.image.source='https://github.com/czy21/container/tree/main/graalvm-jdk-17' -LABEL org.opencontainers.image.title='based on graalvm/graalvm-community:17.0.9' -LABEL org.opencontainers.image.authors='a805899926@gmail.com>' - WORKDIR /app ENV JAR=/app/api.jar diff --git a/server/docker/app/hugo/Dockerfile b/server/docker/app/hugo/Dockerfile index 06b1a92b4..7ae30bd55 100644 --- a/server/docker/app/hugo/Dockerfile +++ b/server/docker/app/hugo/Dockerfile @@ -1,11 +1,6 @@ FROM node:18.17.0-bullseye-slim ARG HUGO_VERSION=0.117.0 -LABEL org.opencontainers.image.url='https://github.com/czy21/container' -LABEL org.opencontainers.image.source='https://github.com/czy21/container/tree/main/hugo' -LABEL org.opencontainers.image.title='based on node:18.17.0-bullseye-slim' -LABEL org.opencontainers.image.authors='a805899926@gmail.com>' - WORKDIR /app RUN apt-get update -y && apt install wget -y && rm -rf /var/lib/apt/lists/* diff --git a/server/docker/app/jdk-11/Dockerfile b/server/docker/app/jdk-11/Dockerfile index f826da93b..88f85c492 100644 --- a/server/docker/app/jdk-11/Dockerfile +++ b/server/docker/app/jdk-11/Dockerfile @@ -1,10 +1,5 @@ FROM eclipse-temurin:11.0.21_9-jdk-jammy -LABEL org.opencontainers.image.url='https://github.com/czy21/container' -LABEL org.opencontainers.image.source='https://github.com/czy21/container/tree/main/jdk-11' -LABEL org.opencontainers.image.title='based on eclipse-temurin:11.0.21_9-jdk-jammy' -LABEL org.opencontainers.image.authors='a805899926@gmail.com>' - WORKDIR /app ENV JAR=/app/api.jar diff --git a/server/docker/app/jdk-17/Dockerfile b/server/docker/app/jdk-17/Dockerfile index eabae02d1..0fecf0d52 100644 --- a/server/docker/app/jdk-17/Dockerfile +++ b/server/docker/app/jdk-17/Dockerfile @@ -1,10 +1,5 @@ FROM eclipse-temurin:17.0.9_9-jdk-jammy -LABEL org.opencontainers.image.url='https://github.com/czy21/container' -LABEL org.opencontainers.image.source='https://github.com/czy21/container/tree/main/jdk-17' -LABEL org.opencontainers.image.title='based on eclipse-temurin:17.0.9_9-jdk-jammy' -LABEL org.opencontainers.image.authors='a805899926@gmail.com>' - WORKDIR /app ENV JAR=/app/api.jar diff --git a/server/docker/app/jdk-21/Dockerfile b/server/docker/app/jdk-21/Dockerfile index 96e08dd99..319693285 100644 --- a/server/docker/app/jdk-21/Dockerfile +++ b/server/docker/app/jdk-21/Dockerfile @@ -1,10 +1,5 @@ FROM eclipse-temurin:21.0.1_12-jdk-jammy -LABEL org.opencontainers.image.url='https://github.com/czy21/container' -LABEL org.opencontainers.image.source='https://github.com/czy21/container/tree/main/jdk-21' -LABEL org.opencontainers.image.title='based on eclipse-temurin:21.0.1_12-jdk-jammy' -LABEL org.opencontainers.image.authors='a805899926@gmail.com>' - WORKDIR /app ENV JAR=/app/api.jar diff --git a/server/docker/app/mkdoc/Dockerfile b/server/docker/app/mkdoc/Dockerfile index 86c0ccbe0..f419dcf3f 100644 --- a/server/docker/app/mkdoc/Dockerfile +++ b/server/docker/app/mkdoc/Dockerfile @@ -1,10 +1,5 @@ FROM python:3.9.17-slim-bullseye -LABEL org.opencontainers.image.url='https://github.com/czy21/container' -LABEL org.opencontainers.image.source='https://github.com/czy21/container/tree/main/mkdoc' -LABEL org.opencontainers.image.title='based on python:3.9.17-slim-bullseye' -LABEL org.opencontainers.image.authors='a805899926@gmail.com>' - WORKDIR /app RUN pip install mkdocs mkdocs-material \ No newline at end of file diff --git a/server/docker/ops/jenkins-inbound-agent/Dockerfile b/server/docker/ops/jenkins-inbound-agent/Dockerfile index 052901231..ab4446f0c 100644 --- a/server/docker/ops/jenkins-inbound-agent/Dockerfile +++ b/server/docker/ops/jenkins-inbound-agent/Dockerfile @@ -5,11 +5,6 @@ RUN wget -O - https://get.helm.sh/helm-v{{ param_helm_version }}-linux-amd64.tar FROM jenkins/inbound-agent:3261.v9c670a_4748a_9-2-alpine-jdk17 -LABEL org.opencontainers.image.url='https://github.com/czy21/container' -LABEL org.opencontainers.image.source='https://github.com/czy21/container/tree/main/jenkins-inbound-agent' -LABEL org.opencontainers.image.title='base on jenkins/inbound-agent:3261.v9c670a_4748a_9-2-alpine-jdk17' -LABEL org.opencontainers.image.authors='a805899926@gmail.com>' - USER root COPY --from=builder /root/helm /usr/local/bin/helm diff --git a/server/docker/ops/jenkins-ssh-agent/Dockerfile b/server/docker/ops/jenkins-ssh-agent/Dockerfile index 6ce0034b6..31d239093 100644 --- a/server/docker/ops/jenkins-ssh-agent/Dockerfile +++ b/server/docker/ops/jenkins-ssh-agent/Dockerfile @@ -1,10 +1,5 @@ FROM jenkins/ssh-agent:5.46.0-jdk17 -LABEL org.opencontainers.image.url='https://github.com/czy21/container' -LABEL org.opencontainers.image.source='https://github.com/czy21/container/tree/main/jenkins-ssh-agent' -LABEL org.opencontainers.image.title='base on jenkins/ssh-agent:5.46.0-jdk17' -LABEL org.opencontainers.image.authors='a805899926@gmail.com>' - USER root RUN apt update && apt install git sudo curl -y RUN curl -L "https://github.com/docker/compose/releases/download/v{{ param_compose_version }}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose diff --git a/server/docker/ops/jenkins/Dockerfile b/server/docker/ops/jenkins/Dockerfile index 906688b2a..7e82664c1 100644 --- a/server/docker/ops/jenkins/Dockerfile +++ b/server/docker/ops/jenkins/Dockerfile @@ -1,10 +1,5 @@ FROM jenkins/jenkins:2.474-jdk17 -LABEL org.opencontainers.image.url='https://github.com/czy21/container' -LABEL org.opencontainers.image.source='https://github.com/czy21/container/tree/main/jenkins' -LABEL org.opencontainers.image.title='base on jenkins/jenkins:2.474-jdk17' -LABEL org.opencontainers.image.authors='a805899926@gmail.com>' - USER root RUN apt update && apt install sudo -y RUN curl -L "https://github.com/docker/compose/releases/download/v{{ param_compose_version }}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose