Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
davema-clan committed Apr 25, 2024
1 parent a219fa3 commit 0f1ef1d
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 42 deletions.
75 changes: 35 additions & 40 deletions .github/workflows/hello-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,9 @@ env:
IMAGE_NAME: hello
SECRETS_GITHUB_TOKEN: ${{ secrets.SECRETS_GITHUB_TOKEN }}
on:
workflow_dispatch:
inputs:
admin_approval:
description: 'Require admin approval'
required: true
default: 'false'
release:
types: [published]


jobs:
admin_approval_job:
if: github.event.inputs.admin_approval == 'true' && github.actor == 'davema-clan'
Expand All @@ -40,43 +35,43 @@ jobs:
echo "SHORT_SHA=$SHORT_SHA" >> $GITHUB_OUTPUT
echo "Short SHA: $SHORT_SHA"
Deploy_Prod:
runs-on: ubuntu-latest
needs: [ GetSHA, admin_approval_job ]
# Deploy_Prod:
# runs-on: ubuntu-latest
# needs: [ GetSHA, admin_approval_job ]

if: ${{ github.ref_type == 'tag' }}
# if: ${{ github.ref_type == 'tag' }}

env:
IMAGE_SHA: ${{ needs.GetSHA.outputs.IMAGE_SHA}}
# env:
# IMAGE_SHA: ${{ needs.GetSHA.outputs.IMAGE_SHA}}

steps:
- name: Get Tag Name
id: get_tag_name
run: |
IMAGE_TAG=$(echo $GITHUB_REF | awk -F '/' '{print $NF}')
echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
# steps:
# - name: Get Tag Name
# id: get_tag_name
# run: |
# IMAGE_TAG=$(echo $GITHUB_REF | awk -F '/' '{print $NF}')
# echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV


- name: docker login github repo and push
run: echo "${SECRETS_GITHUB_TOKEN}" | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
# - name: docker login github repo and push
# run: echo "${SECRETS_GITHUB_TOKEN}" | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin

- name: build image to prod
run: |
docker pull ${REGISTRY}/${IMAGE_NAME}:${IMAGE_SHA}
docker tag ${REGISTRY}/${IMAGE_NAME}:${IMAGE_SHA} ${REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}
docker push ${REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}
# - name: build image to prod
# run: |
# docker pull ${REGISTRY}/${IMAGE_NAME}:${IMAGE_SHA}
# docker tag ${REGISTRY}/${IMAGE_NAME}:${IMAGE_SHA} ${REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}
# docker push ${REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}

- name: Deploy prod
uses: appleboy/[email protected]
with:
host: ${{ secrets.REMOTE_HOST_TEST }}
username: ubuntu
key: ${{ secrets.SSH_PRIVATE_KEY_TEST }}
port: 22
envs: GITHUB_ACTOR,SECRETS_GITHUB_TOKEN,IMAGE_NAME,IMAGE_TAG,REGISTRY
script: |
echo "$GITHUB_ACTOR $REGISTRY $IMAGE_TAG $IMAGE_NAME $SECRETS_GITHUB_TOKEN IMAGE_SHA" > test.txt
echo "$SECRETS_GITHUB_TOKEN" | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
docker stop $IMAGE_NAME
docker rm $IMAGE_NAME
docker run -d --name $IMAGE_NAME ghcr.io/${REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}
# - name: Deploy prod
# uses: appleboy/[email protected]
# with:
# host: ${{ secrets.REMOTE_HOST_TEST }}
# username: ubuntu
# key: ${{ secrets.SSH_PRIVATE_KEY_TEST }}
# port: 22
# envs: GITHUB_ACTOR,SECRETS_GITHUB_TOKEN,IMAGE_NAME,IMAGE_TAG,REGISTRY
# script: |
# echo "$GITHUB_ACTOR $REGISTRY $IMAGE_TAG $IMAGE_NAME $SECRETS_GITHUB_TOKEN IMAGE_SHA" > test.txt
# echo "$SECRETS_GITHUB_TOKEN" | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
# docker stop $IMAGE_NAME
# docker rm $IMAGE_NAME
# docker run -d --name $IMAGE_NAME ghcr.io/${REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}
3 changes: 1 addition & 2 deletions .github/workflows/hello.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ env:
SECRETS_GITHUB_TOKEN: ${{ secrets.SECRETS_GITHUB_TOKEN }}
on:
push:
tags:
- '*'
branches: [ master ]



Expand Down

0 comments on commit 0f1ef1d

Please sign in to comment.