Skip to content

Commit 5611dfc

Browse files
committed
gh actions code clean
1 parent d8f74e4 commit 5611dfc

File tree

2 files changed

+1
-28
lines changed

2 files changed

+1
-28
lines changed

.github/Dockerfile_PreBuild_OC

Lines changed: 0 additions & 11 deletions
This file was deleted.

.github/workflows/build_container.yml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,19 @@ name: Build and publish container develop
22

33
# read-write repo token
44
# access to secrets
5-
on:
6-
workflow_dispatch:
7-
push:
8-
branches:
9-
- "*"
10-
- "**"
11-
# - develop
5+
on: [push]
126

137
env:
14-
## Sets environment variable
158
DOCKER_HUB_ORGANIZATION: ${{ vars.DOCKER_HUB_ORGANIZATION }}
169
DOCKER_HUB_REPOSITORY: obp-api
1710

1811
jobs:
1912
build:
2013
runs-on: ubuntu-latest
2114
services:
22-
# Label used to access the service container
2315
redis:
24-
# Docker Hub image
2516
image: redis
2617
ports:
27-
# Opens tcp port 6379 on the host and service container
2818
- 6379:6379
2919
# Set health checks to wait until redis has started
3020
options: >-
@@ -132,10 +122,8 @@ jobs:
132122
echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin docker.io
133123
if [ "${{ github.ref }}" == "refs/heads/develop" ]; then
134124
docker build . --file .github/Dockerfile_PreBuild --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}
135-
# docker build . --file .github/Dockerfile_PreBuild_OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}-OC
136125
else
137126
docker build . --file .github/Dockerfile_PreBuild --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}
138-
# docker build . --file .github/Dockerfile_PreBuild_OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}-OC
139127
fi
140128
docker push docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }} --all-tags
141129
echo docker done
@@ -153,13 +141,9 @@ jobs:
153141
docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}
154142
cosign sign -y --key cosign.key \
155143
docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA
156-
# cosign sign -y --key cosign.key \
157-
# docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}-OC
158144
if [ "${{ github.ref }}" == "refs/heads/develop" ]; then
159145
cosign sign -y --key cosign.key \
160146
docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest
161-
# cosign sign -y --key cosign.key \
162-
# docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest-OC
163147
fi
164148
env:
165149
COSIGN_PASSWORD: "${{secrets.COSIGN_PASSWORD}}"

0 commit comments

Comments
 (0)