update some images (#51)

v8fg · Mar 30, 2022 · 6bf04fd · 6bf04fd
1 parent c968dd2
commit 6bf04fd
Show file tree

Hide file tree

Showing 179 changed files with 705 additions and 2,701 deletions.
diff --git a/gitlab/README.md b/gitlab/README.md
@@ -8,6 +8,7 @@
 
 - [x] [latest](./gitlab-ce/latest/Dockerfile)
 - [x] [nightly](./gitlab-ce/nightly/Dockerfile)
+- [x] [14.9](./gitlab-ce/14.9/Dockerfile)
 - [x] [14.5.2](./gitlab-ce/14.5.2/Dockerfile)
 
 ### runner
@@ -18,8 +19,8 @@
 ### sameersbn
 
 - [x] [latest](./gitlab-sameersbn/latest/Dockerfile)
+- [x] [14.9](./gitlab-sameersbn/14.9/Dockerfile)
 - [x] [14.4.3](./gitlab-sameersbn/14.4.3/Dockerfile)
-- [x] [13.12.4](./gitlab-sameersbn/13.12.4/Dockerfile)
 
 ## Scripts
 

diff --git a/gitlab/gitlab-sameersbn/13.12.4/Dockerfile → gitlab/gitlab-ce/14.9/Dockerfile b/gitlab/gitlab-sameersbn/13.12.4/Dockerfile → gitlab/gitlab-ce/14.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM sameersbn/gitlab:13.12.4
+FROM gitlab/gitlab-ce:14.9.1-ce.0
 
 LABEL maintainer="[email protected]" github="https://github.com/xwi88" group="https://github.com/v8fg"
 

diff --git a/gitlab/gitlab-ce/14.9/docker-version.sh b/gitlab/gitlab-ce/14.9/docker-version.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# image info, version may auto update
+TAG=14.9
+USER=v8fg
+NAME=gitlab-ce
+
+REPOSITORY=${USER}/${NAME}
+# image with tag, use to push image
+LOCATION=${REPOSITORY}:${TAG}
+
+# use to build container
+CONTAINER_NAME=${USER}-${NAME}-${TAG}
+
+# ARGS ...
+
+# DAEMON="-d"
+# ENV=""
+PORT="-p 6622:22 -P 6680:80 6643:43"
+
diff --git a/nginx/1.21.1/Dockerfile → gitlab/gitlab-sameersbn/14.9/Dockerfile b/nginx/1.21.1/Dockerfile → gitlab/gitlab-sameersbn/14.9/Dockerfile
@@ -1,7 +1,5 @@
-FROM nginx:1.21.1
+FROM sameersbn/gitlab:14.9.1
 
 LABEL maintainer="[email protected]" github="https://github.com/xwi88" group="https://github.com/v8fg"
 
 ENV TZ=Asia/Shanghai
-
-EXPOSE 80
diff --git a/...itlab-sameersbn/13.12.4/docker-version.sh → ...b/gitlab-sameersbn/14.9/docker-version.sh b/...itlab-sameersbn/13.12.4/docker-version.sh → ...b/gitlab-sameersbn/14.9/docker-version.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # image info, version may auto update
-TAG=13.12.4
+TAG=14.9
 USER=v8fg
 NAME=gitlab
 

diff --git a/grafana/7.0.3-ubuntu/Dockerfile b/grafana/7.0.3-ubuntu/Dockerfile
diff --git a/grafana/7.0.3/Dockerfile b/grafana/7.0.3/Dockerfile
diff --git a/grafana/8.4.4-ubuntu/Dockerfile b/grafana/8.4.4-ubuntu/Dockerfile
@@ -0,0 +1,5 @@
+FROM grafana/grafana:8.4.4-ubuntu
+
+LABEL author="xwi88" type="grafana" github="https://github.com/xwi88" group="https://github.com/v8fg"
+
+ENV TZ=Asia/Shanghai
diff --git a/grafana/7.0.3-ubuntu/conf/grafana.ini → grafana/8.4.4-ubuntu/conf/grafana.ini b/grafana/7.0.3-ubuntu/conf/grafana.ini → grafana/8.4.4-ubuntu/conf/grafana.ini
diff --git a/grafana/7.0.3-ubuntu/docker-compose.yml → grafana/8.4.4-ubuntu/docker-compose.yml b/grafana/7.0.3-ubuntu/docker-compose.yml → grafana/8.4.4-ubuntu/docker-compose.yml
@@ -2,8 +2,8 @@ version: '3.8'
 services:
   grafana:
     build: .
-    container_name: v8fg-grafana-7.0.3-ubuntu
-    image: v8fg/grafana:7.0.3-ubuntu
+    container_name: v8fg-grafana-8.4.4-ubuntu
+    image: v8fg/grafana:8.4.4-ubuntu
     privileged: true
     init: true
     # environment: 

diff --git a/grafana/7.0.3-ubuntu/docker-version.sh → grafana/8.4.4-ubuntu/docker-version.sh b/grafana/7.0.3-ubuntu/docker-version.sh → grafana/8.4.4-ubuntu/docker-version.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # image info, version may auto update
-TAG=7.0.3-ubuntu
+TAG=8.4.4-ubuntu
 USER=v8fg
 NAME=grafana
 

diff --git a/grafana/8.4.4/Dockerfile b/grafana/8.4.4/Dockerfile
@@ -0,0 +1,5 @@
+FROM grafana/grafana:8.4.4
+
+LABEL author="xwi88" type="grafana" github="https://github.com/xwi88" group="https://github.com/v8fg"
+
+ENV TZ=Asia/Shanghai
diff --git a/grafana/7.0.3/conf/grafana.ini → grafana/8.4.4/conf/grafana.ini b/grafana/7.0.3/conf/grafana.ini → grafana/8.4.4/conf/grafana.ini
diff --git a/grafana/7.0.3/docker-compose.yml → grafana/8.4.4/docker-compose.yml b/grafana/7.0.3/docker-compose.yml → grafana/8.4.4/docker-compose.yml
@@ -2,8 +2,8 @@ version: '3.8'
 services:
   grafana:
     build: .
-    container_name: v8fg-grafana-7.0.3
-    image: v8fg/grafana:7.0.3
+    container_name: v8fg-grafana-8.4.4
+    image: v8fg/grafana:8.4.4
     privileged: true
     init: true
     # environment: 

diff --git a/grafana/7.0.3/docker-version.sh → grafana/8.4.4/docker-version.sh b/grafana/7.0.3/docker-version.sh → grafana/8.4.4/docker-version.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # image info, version may auto update
-TAG=7.0.3
+TAG=8.4.4
 USER=v8fg
 NAME=grafana
 

diff --git a/grafana/README.md b/grafana/README.md
@@ -3,10 +3,10 @@
 ## Images
 
 - [x] [latest](./latest/Dockerfile)
+- [x] [8.4.4-ubuntu](./8.4.4-ubuntu/Dockerfile)
+- [x] [8.4.4](./8.4.4/Dockerfile)
 - [x] [8.3.1-ubuntu](./8.3.1-ubuntu/Dockerfile)
 - [x] [8.3.1](./8.3.1/Dockerfile)
-- [x] [7.0.3](./7.0.3/Dockerfile)
-- [x] [7.0.3-ubuntu](./7.0.3-ubuntu/Dockerfile)
 
 ## Scripts
 

diff --git a/kafka/2.12-2.5.0/Dockerfile b/kafka/2.12-2.5.0/Dockerfile
diff --git a/kafka/2.13-2.7.1/Dockerfile b/kafka/2.13-2.7.1/Dockerfile
diff --git a/kafka/2.13-2.7.1/docker-compose.yml b/kafka/2.13-2.7.1/docker-compose.yml
diff --git a/kafka/2.13-2.8.1/Dockerfile b/kafka/2.13-2.8.1/Dockerfile
@@ -0,0 +1,7 @@
+FROM wurstmeister/kafka:2.13-2.8.1
+
+LABEL author="xwi88" type="kafka" github="https://github.com/xwi88" group="https://github.com/v8fg"
+
+RUN apk add --no-cache tzdata bash
+
+ENV TZ=Asia/Shanghai
diff --git a/kafka/2.12-2.5.0/docker-compose.yml → kafka/2.13-2.8.1/docker-compose.yml b/kafka/2.12-2.5.0/docker-compose.yml → kafka/2.13-2.8.1/docker-compose.yml
@@ -2,10 +2,10 @@ version: '3.7'
 services:
   kafka:
     build: .
-    container_name: kafka-2.12-2.5.0
+    container_name: kafka-2.13-2.8.1
     environment:
       TZ: Asia/Shanghai
-    image: v8fg/kafka:2.12-2.5.0
+    image: v8fg/kafka:2.13-2.8.1
     stdin_open: true
     tty: true 
     restart: 'no' # no|on-failure[:max-retries]|always|unless-stopped

diff --git a/kafka/2.12-2.5.0/docker-version.sh → kafka/2.13-2.8.1/docker-version.sh b/kafka/2.12-2.5.0/docker-version.sh → kafka/2.13-2.8.1/docker-version.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # image info, version may auto update
-TAG=2.12-2.5.0
+TAG=2.13-2.8.1
 USER=v8fg
 NAME=kafka
 

diff --git a/kafka/3-debian-10/Dockerfile b/kafka/3-debian-10/Dockerfile
@@ -1,6 +1,6 @@
 FROM bitnami/kafka:3-debian-10
 
-LABEL maintainer="[email protected]" github="https://github.com/xwi88" group="https://github.com/v8fg"
+LABEL author="xwi88" type="kafka" github="https://github.com/xwi88" group="https://github.com/v8fg"
 
 USER root
 

diff --git a/kafka/README.md b/kafka/README.md
@@ -4,8 +4,7 @@
 
 - [x] [latest](./latest/Dockerfile)
 - [x] [3-debian-10](./3-debian-10/Dockerfile)
-- [x] [2.13-2.7.1](./2.13-2.7.1/Dockerfile)
-- [x] [2.12-2.5.0](./2.12-2.5.0/Dockerfile)
+- [x] [2.13-2.8.1](./2.13-2.8.1/Dockerfile)
 
 ## Scripts
 

diff --git a/kafka/latest/Dockerfile b/kafka/latest/Dockerfile
@@ -1,6 +1,6 @@
-FROM wurstmeister/kafka:2.13-2.7.1
+FROM wurstmeister/kafka:2.13-2.8.1
 
-LABEL maintainer="[email protected]" github="https://github.com/xwi88" group="https://github.com/v8fg"
+LABEL author="xwi88" type="kafka" github="https://github.com/xwi88" group="https://github.com/v8fg"
 
 RUN apk add --no-cache tzdata bash
 

diff --git a/nexus3/3.23.0/Dockerfile b/nexus3/3.23.0/Dockerfile
diff --git a/nexus3/3.23.0/docker-compose.yml b/nexus3/3.23.0/docker-compose.yml
diff --git a/nexus3/3.24.0/.env b/nexus3/3.24.0/.env
diff --git a/nexus3/3.24.0/Dockerfile b/nexus3/3.24.0/Dockerfile
diff --git a/nexus3/3.24.0/docker-version.sh b/nexus3/3.24.0/docker-version.sh
diff --git a/nexus3/3.23.0/.env → nexus3/3.38.1/.env b/nexus3/3.23.0/.env → nexus3/3.38.1/.env
diff --git a/nexus3/3.38.1/Dockerfile b/nexus3/3.38.1/Dockerfile
@@ -0,0 +1,5 @@
+FROM sonatype/nexus3:3.38.1
+
+LABEL author="xwi88" type="nexus3" github="https://github.com/xwi88" group="https://github.com/v8fg"
+
+ENV TZ=Asia/Shanghai
diff --git a/nexus3/3.24.0/docker-compose.yml → nexus3/3.38.1/docker-compose.yml b/nexus3/3.24.0/docker-compose.yml → nexus3/3.38.1/docker-compose.yml
@@ -2,8 +2,8 @@ version: '3.8'
 services:
   nexus3:
     build: .
-    container_name: nexus3-3.24.0
-    image: v8fg/nexus3:3.24.0
+    container_name: nexus3-3.38.1
+    image: v8fg/nexus3:3.38.1
     # privileged: true
     init: true
     env_file:

diff --git a/nexus3/3.23.0/docker-version.sh → nexus3/3.38.1/docker-version.sh b/nexus3/3.23.0/docker-version.sh → nexus3/3.38.1/docker-version.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # image info, version may auto update
-TAG=3.23.0
+TAG=3.38.1
 USER=v8fg
 NAME=nexus3
 

diff --git a/nexus3/README.md b/nexus3/README.md
@@ -3,9 +3,8 @@
 ## Images
 
 - [x] [latest](./latest/Dockerfile)
+- [x] [3.38.1](./3.38.1/Dockerfile)
 - [x] [3.29.2](./3.29.2/Dockerfile)
-- [x] [3.24.0](./3.24.0/Dockerfile)
-- [x] [3.23.0](./3.23.0/Dockerfile)
 
 ## Scripts
 

diff --git a/nexus3/latest/Dockerfile b/nexus3/latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM sonatype/nexus3:3.29.2
+FROM sonatype/nexus3:3.38.1
 
 LABEL maintainer="[email protected]" github="https://github.com/xwi88" group="https://github.com/v8fg"
 

diff --git a/nginx/1.19.10-alpine-perl/Dockerfile b/nginx/1.19.10-alpine-perl/Dockerfile
diff --git a/nginx/1.19.10-alpine-perl/docker-compose.yml b/nginx/1.19.10-alpine-perl/docker-compose.yml
diff --git a/nginx/1.19.10-alpine-perl/docker-version.sh b/nginx/1.19.10-alpine-perl/docker-version.sh
diff --git a/nginx/1.19.10-alpine/Dockerfile b/nginx/1.19.10-alpine/Dockerfile
diff --git a/nginx/1.19.10-alpine/docker-version.sh b/nginx/1.19.10-alpine/docker-version.sh