Skip to content

Commit 07b764e

Browse files
wing328wing328
authored
Clean up docker release workflow (#21788)
* clean up docker release workflow * undo * comment out docker in travis.yml
1 parent 11a0075 commit 07b764e

File tree

2 files changed

+47
-48
lines changed

2 files changed

+47
-48
lines changed

‎.github/workflows/docker-release.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: Release to DockerHub (snapshot, stable)
22

33
on:
4-
pull_request:
54
push:
65
branches:
76
- master
@@ -70,4 +69,4 @@ jobs:
7069
run: |
7170
cp docker-entrypoint.sh ./modules/openapi-generator-cli
7271
docker buildx create --use
73-
docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=${{ env.build_date }} --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$GITHUB_SHA --label=org.opencontainers.image.version=${{ env.cli_version }} -t ${{ env.DOCKER_CODEGEN_CLI_IMAGE_NAME }}:latest -t ${{ env.DOCKER_CODEGEN_CLI_IMAGE_NAME }}:${{ github.ref_name }} -t ${{ env.DOCKER_CODEGEN_CLI_IMAGE_NAME }} -t ${{ env.DOCKER_CODEGEN_CLI_IMAGE_NAME }}:latest-release ./modules/openapi-generator-cli
72+
docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=${{ env.build_date }} --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$GITHUB_SHA --label=org.opencontainers.image.version=${{ env.cli_version }} -t ${{ env.DOCKER_CODEGEN_CLI_IMAGE_NAME }}:latest -t ${{ env.DOCKER_CODEGEN_CLI_IMAGE_NAME }}:${{ github.ref_name }} -t ${{ env.DOCKER_CODEGEN_CLI_IMAGE_NAME }} -t ${{ env.DOCKER_CODEGEN_CLI_IMAGE_NAME }}:latest-release ./modules/openapi-generator-cli

‎.travis.yml‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ cache:
3232
- $HOME/.cache/deno
3333
- $HOME/.phpenv/versions/8.1.4
3434

35-
services:
36-
- docker
35+
#services:
36+
# - docker
3737

3838
# comment out the host table change to use the public petstore server
3939
addons:
@@ -47,16 +47,16 @@ addons:
4747
- petstore.swagger.io
4848

4949
before_install:
50-
- sudo rm -rf /var/lib/apt/lists/*
51-
- curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
52-
- sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) edge"
53-
- sudo apt-get update
54-
#- sudo apt-get install -qqy --no-install-recommends google-chrome-stable
55-
#- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
56-
- mkdir -vp ~/.docker/cli-plugins/
57-
- curl --silent -L "https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
58-
- chmod a+x ~/.docker/cli-plugins/docker-buildx
59-
# to run petstore server locally via docker
50+
# - sudo rm -rf /var/lib/apt/lists/*
51+
# - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
52+
# - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) edge"
53+
# - sudo apt-get update
54+
# #- sudo apt-get install -qqy --no-install-recommends google-chrome-stable
55+
# #- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
56+
# - mkdir -vp ~/.docker/cli-plugins/
57+
# - curl --silent -L "https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
58+
# - chmod a+x ~/.docker/cli-plugins/docker-buildx
59+
# # to run petstore server locally via docker
6060
#- echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin || true
6161
#- docker pull swaggerapi/petstore
6262
#- docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
@@ -133,7 +133,7 @@ script:
133133
# fail fast
134134
- set -e
135135
# show docker buildx version
136-
- docker buildx version
136+
#- docker buildx version
137137
# run integration tests defined in maven pom.xml
138138
# WARN: Travis will timeout after 10 minutes of no stdout/stderr activity, which is problematic with mvn --quiet.
139139
# show "error" only to reduce the log size
@@ -169,39 +169,39 @@ after_success:
169169
popd;
170170
fi;
171171
fi;
172-
## docker: build and push openapi-generator-online to DockerHub
173-
- if [ $DOCKER_HUB_USERNAME ]; then
174-
echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin;
175-
export cli_version=$(\mvn -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\[');
176-
export build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ");
177-
docker buildx create --use;
178-
if [ ! -z "$TRAVIS_TAG" ]; then
179-
docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-online --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_GENERATOR_IMAGE_NAME:latest -t $DOCKER_GENERATOR_IMAGE_NAME:$TRAVIS_TAG -t $DOCKER_GENERATOR_IMAGE_NAME -t $DOCKER_GENERATOR_IMAGE_NAME:latest-release ./modules/openapi-generator-online;
180-
echo "Built and tagged $DOCKER_GENERATOR_IMAGE_NAME";
181-
fi;
182-
if [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
183-
docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-online --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/openapi-generator-online;
184-
echo "Pushed to $DOCKER_GENERATOR_IMAGE_NAME for master";
185-
fi;
186-
fi;
187-
## docker: build cli image and push to Docker Hub
188-
- if [ $DOCKER_HUB_USERNAME ]; then
189-
echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin;
190-
cp docker-entrypoint.sh ./modules/openapi-generator-cli;
191-
export cli_version=$(\mvn -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\[');
192-
export build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ");
193-
docker buildx create --use;
194-
docker buildx build --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/openapi-generator-cli;
195-
if [ ! -z "$TRAVIS_TAG" ]; then
196-
docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:$TRAVIS_TAG -t $DOCKER_CODEGEN_CLI_IMAGE_NAME -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest-release ./modules/openapi-generator-cli;
197-
echo "Built and tagged $DOCKER_GENERATOR_IMAGE_NAME";
198-
fi;
199-
if [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
200-
docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/openapi-generator-cli;
201-
echo "Pushed to $DOCKER_CODEGEN_CLI_IMAGE_NAME";
202-
fi;
203-
fi;
204-
## NOTE; we will do the followign manually instead as the page doesn't need to be updated in every single travis build
172+
# ## docker: build and push openapi-generator-online to DockerHub
173+
# - if [ $DOCKER_HUB_USERNAME ]; then
174+
# echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin;
175+
# export cli_version=$(\mvn -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\[');
176+
# export build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ");
177+
# docker buildx create --use;
178+
# if [ ! -z "$TRAVIS_TAG" ]; then
179+
# docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-online --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_GENERATOR_IMAGE_NAME:latest -t $DOCKER_GENERATOR_IMAGE_NAME:$TRAVIS_TAG -t $DOCKER_GENERATOR_IMAGE_NAME -t $DOCKER_GENERATOR_IMAGE_NAME:latest-release ./modules/openapi-generator-online;
180+
# echo "Built and tagged $DOCKER_GENERATOR_IMAGE_NAME";
181+
# fi;
182+
# if [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
183+
# docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-online --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/openapi-generator-online;
184+
# echo "Pushed to $DOCKER_GENERATOR_IMAGE_NAME for master";
185+
# fi;
186+
# fi;
187+
## ## docker: build cli image and push to Docker Hub
188+
# - if [ $DOCKER_HUB_USERNAME ]; then
189+
# echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin;
190+
# cp docker-entrypoint.sh ./modules/openapi-generator-cli;
191+
# export cli_version=$(\mvn -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\[');
192+
# export build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ");
193+
# docker buildx create --use;
194+
# docker buildx build --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/openapi-generator-cli;
195+
# if [ ! -z "$TRAVIS_TAG" ]; then
196+
# docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:$TRAVIS_TAG -t $DOCKER_CODEGEN_CLI_IMAGE_NAME -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest-release ./modules/openapi-generator-cli;
197+
# echo "Built and tagged $DOCKER_GENERATOR_IMAGE_NAME";
198+
# fi;
199+
# if [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
200+
# docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/openapi-generator-cli;
201+
# echo "Pushed to $DOCKER_CODEGEN_CLI_IMAGE_NAME";
202+
# fi;
203+
# fi;
204+
# ## NOTE; we will do the followign manually instead as the page doesn't need to be updated in every single travis build
205205
## publish latest website, variables below are secure environment variables which are unavailable to PRs from forks.
206206
# - if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
207207
# sed -i "s/Vector{UInt8}/Vector\{UInt8\}/g" docs/generators/julia-client.md;

0 commit comments

Comments
 (0)