Skip to content

Commit

Permalink
fix: bump git version to 2.26.2 (#1475)
Browse files Browse the repository at this point in the history 
- bump alpine from 3.8 to 3.12
- bump git from 2.18 to 2.26

In order to fix
- GHSA-hjc9-x69f-jqj7
- GHSA-qm7j-c969-7j4q
- filter sensitive information printing when git fetch/clone failed
  • Loading branch information
@zhujian7
zhujian7 committed Aug 10, 2020
1 parent d2ccdb8 commit 3acc487
Show file tree
Hide file tree
Showing 23 changed files with 24 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ BASE_REGISTRY ?= docker.io/library
CYCLONE_BASE_REGISTRY ?= docker.io/caicloud

# Version of the cyclone base images.
CYCLONE_BASE_VERSION ?= v1.0.0
CYCLONE_BASE_VERSION ?= v1.1.0

# Example scene
SCENE ?= cicd
Expand Down
3 changes: 2 additions & 1 deletion build/base/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM alpine:3.8
FROM alpine:3.12
LABEL maintainer="zhujian@caicloud.io"

# git version: 2.26.2
RUN apk update && \
apk add --no-cache ca-certificates bash coreutils git subversion curl jq

Expand Down
2 changes: 1 addition & 1 deletion build/base/alpine/Dockerfile.arm64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM arm64v8/alpine:3.8
FROM arm64v8/alpine:3.12
LABEL maintainer="zhujian@caicloud.io"

RUN apk update && \
Expand Down
2 changes: 1 addition & 1 deletion build/cicd/cd/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0
FROM caicloud/cyclone-base-alpine:v1.1.0

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/cicd/cd/Dockerfile.arm64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0-arm64v8
FROM caicloud/cyclone-base-alpine:v1.1.0-arm64v8

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/resolver/git/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0
FROM caicloud/cyclone-base-alpine:v1.1.0

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/resolver/git/Dockerfile.arm64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0-arm64v8
FROM caicloud/cyclone-base-alpine:v1.1.0-arm64v8

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/resolver/http/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0
FROM caicloud/cyclone-base-alpine:v1.1.0

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/resolver/http/Dockerfile.arm64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0-arm64v8
FROM caicloud/cyclone-base-alpine:v1.1.0-arm64v8

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/resolver/image/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0
FROM caicloud/cyclone-base-alpine:v1.1.0

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/resolver/image/Dockerfile.arm64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0-arm64v8
FROM caicloud/cyclone-base-alpine:v1.1.0-arm64v8

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/resolver/svn/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0
FROM caicloud/cyclone-base-alpine:v1.1.0

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/resolver/svn/Dockerfile.arm64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0-arm64v8
FROM caicloud/cyclone-base-alpine:v1.1.0-arm64v8

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/server/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0
FROM caicloud/cyclone-base-alpine:v1.1.0

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/server/Dockerfile.arm64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0-arm64v8
FROM caicloud/cyclone-base-alpine:v1.1.0-arm64v8

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/toolbox/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0
FROM caicloud/cyclone-base-alpine:v1.1.0

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/toolbox/Dockerfile.arm64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0-arm64v8
FROM caicloud/cyclone-base-alpine:v1.1.0-arm64v8

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/watcher/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0
FROM caicloud/cyclone-base-alpine:v1.1.0

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/watcher/Dockerfile.arm64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0-arm64v8
FROM caicloud/cyclone-base-alpine:v1.1.0-arm64v8

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/workflow/controller/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0
FROM caicloud/cyclone-base-alpine:v1.1.0

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/workflow/controller/Dockerfile.arm64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0-arm64v8
FROM caicloud/cyclone-base-alpine:v1.1.0-arm64v8

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/workflow/coordinator/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0
FROM caicloud/cyclone-base-alpine:v1.1.0

LABEL maintainer="zhujian@caicloud.io"

Expand Down
2 changes: 1 addition & 1 deletion build/workflow/coordinator/Dockerfile.arm64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM caicloud/cyclone-base-alpine:v1.0.0-arm64v8
FROM caicloud/cyclone-base-alpine:v1.1.0-arm64v8

LABEL maintainer="zhujian@caicloud.io"

Expand Down

0 comments on commit 3acc487

Please sign in to comment.