generator-reshow 0.17.69 → 0.17.71

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  ARG VERSION=${VERSION:-[VERSION]}
2
2
 
3
- FROM alpine:3.15
3
+ FROM alpine:3.17
4
4
 
5
5
  ARG VERSION
6
6
 
@@ -1,5 +1,21 @@
1
1
  version: 2.1
2
2
 
3
+ commands:
4
+ install-docker-buildx:
5
+ description: Install Docker Buildx
6
+ steps:
7
+ - run:
8
+ name: Install Docker Buildx
9
+ command: |
10
+ mkdir -vp ~/.docker/cli-plugins/
11
+ curl --silent -L "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
12
+ chmod a+x ~/.docker/cli-plugins/docker-buildx
13
+ docker buildx version
14
+ sudo apt-get update && sudo apt-get install -y binfmt-support qemu-user-static
15
+ docker run --rm --privileged tonistiigi/binfmt --install arm64
16
+ docker context create buildcontext
17
+ docker buildx create buildcontext --use
18
+
3
19
  executors:
4
20
  docker-publisher:
5
21
  docker:
@@ -13,7 +29,7 @@ jobs:
13
29
  steps:
14
30
  - checkout
15
31
  - setup_remote_docker:
16
- version: 20.10.7
32
+ version: 20.10.18
17
33
  docker_layer_caching: true
18
34
  - run:
19
35
  name: "Test with terratest"
@@ -30,7 +46,7 @@ jobs:
30
46
  steps:
31
47
  - checkout
32
48
  - setup_remote_docker:
33
- version: 20.10.7
49
+ version: 20.10.18
34
50
  docker_layer_caching: true
35
51
  - run:
36
52
  name: Log time
@@ -52,6 +68,10 @@ jobs:
52
68
  cat ${BUILD_FOLDER}/$file
53
69
  echo ""
54
70
  done
71
+ - install-docker-buildx
72
+ - run:
73
+ name: login
74
+ command: ./compile.sh login
55
75
  - run:
56
76
  name: build Docker image
57
77
  command: |
@@ -62,17 +82,23 @@ jobs:
62
82
  BUILD_VERSION=<< parameters.docker-tag >>
63
83
  BUILD_FOLDER=${VER_PREFIX}-<< parameters.docker-tag >>
64
84
  BUILD_ARG=""
85
+ LATEST_TAG=""
65
86
  if [ "x$VERSION" == "x$BUILD_VERSION" ]; then
66
- BUILD_ARG="--build-arg ALT_VERSION=${ALT_VERSION}"
87
+ if [ -n "${ALT_VERSION}" ]; then
88
+ BUILD_ARG="--build-arg ALT_VERSION=${ALT_VERSION}"
89
+ fi
90
+ LATEST_TAG="-t $IMAGE_NAME:latest"
67
91
  fi
68
92
  echo "Build ARGS: ${BUILD_ARG}"
69
- docker build ${BUILD_ARG} -f ${BUILD_FOLDER}/Dockerfile \
70
- -t $IMAGE_NAME:${BUILD_VERSION} \
93
+ docker buildx inspect --bootstrap
94
+ docker buildx build ${BUILD_ARG} -f ${BUILD_FOLDER}/Dockerfile \
95
+ --push \
96
+ --platform linux/amd64,linux/arm64/v8 \
97
+ -t $IMAGE_NAME:${BUILD_VERSION} ${LATEST_TAG} \
71
98
  ./${BUILD_FOLDER}
72
99
  - run:
73
- name: Publish Docker Image to Docker Hub
74
- command: |
75
- DOCKER_HUB=1 ./compile.sh p << parameters.docker-tag >>
100
+ name: logout
101
+ command: docker logout
76
102
 
77
103
  workflows:
78
104
  run-job:
@@ -110,6 +110,9 @@ case "$1" in
110
110
  restore)
111
111
  restore
112
112
  ;;
113
+ login)
114
+ login
115
+ ;;
113
116
  p)
114
117
  push $2 $3
115
118
  ;;
@@ -28,7 +28,7 @@ echo "###"
28
28
  echo ""
29
29
  echo $UPGRADE
30
30
 
31
- apk add --virtual .build-deps $BUILD_DEPS && apk add $INSTALL --upgrade $UPGRADE
31
+ apk add --virtual .build-deps $BUILD_DEPS && apk add $INSTALL --upgrade $UPGRADE || exit 2
32
32
 
33
33
  #/* put your install code here */#
34
34
 
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "0.17.69",
2
+ "version": "0.17.71",
3
3
  "name": "generator-reshow",
4
4
  "repository": {
5
5
  "type": "git",