From 395a676298cb288258935579ce92c57764e8ba78 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 14:05:05 -0600 Subject: [PATCH 01/41] Only tagged version push to docker.io --- .github/workflows/smile-server.yaml | 48 +++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 568e6153..c628147f 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -76,12 +76,22 @@ jobs: DOCKERHUB_README="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then + if env.GITHUB_BRANCH == 'main'; then DOCKERHUB_PUSH="true" - if [ -e "README.md" ]; then - DOCKERHUB_README="true" + if [ -e "README.md" ]; then + DOCKERHUB_README="true" + fi fi fi fi + + # should we push to github + GITHUB_PUSH="false" + if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then + if env.GITHUB_BRANCH == 'develop'; then + GITHUB_PUSH="true" + fi + fi # should we push to NCSA NCSAHUB_PUSH="false" @@ -101,7 +111,9 @@ jobs: if [ "$NCSAHUB_PUSH" == "true" ]; then IMAGES="${IMAGES}${NCSAHUB}/${IMAGE}:${tag}," fi - IMAGES="${IMAGES}ghcr.io/${OWNER_LC}/${IMAGE}:${tag}," + if [ "$GITHUB_PUSH" == "true" ]; then + IMAGES="${IMAGES}ghcr.io/${OWNER_LC}/${IMAGE}:${tag}," + fi done IMAGES="${IMAGES%,*}" @@ -120,6 +132,12 @@ jobs: echo "NCSAHUB_PUSH=${NCSAHUB_PUSH}" >> $GITHUB_ENV echo "IMAGES=${IMAGES}" >> $GITHUB_ENV + - name: Print Images + run: echo "${{ env.IMAGES }}" + + - name: Print Version tag + run: echo "${{ env.TAGS }}" + # setup docker build - name: Set up QEMU uses: docker/setup-qemu-action@v2 @@ -184,3 +202,27 @@ jobs: password: ${{ secrets.DOCKERHUB_PASSWORD }} repository: ${{ env.DOCKERHUB_ORG }}/${{ github.event.repository.name }} readme-filepath: README.md + + - name: Publish image to Github + if: env.GITHUB_PUSH == 'true' + uses: elgohr/Publish-Docker-Github-Action@3.04 + with: + registry: ghcr.io + name: ${{ matrix.docker_repo_tag }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + tags: ${{ env.IMAGES }} + workdir: ./www + IMAGES="${IMAGES}ghcr: + io/${OWNER_LC}/${IMAGE}:${tag},": + + - name: Publish doc image to Docker Hub + if: env.DOCKERHUB_PUSH == 'true' + uses: elgohr/Publish-Docker-Github-Action@3.04 + with: + registry: docker.io + name: ${{ matrix.docker_repo_tag }} + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + tags: ${{ env.IMAGES }} + workdir: ./www \ No newline at end of file From e207511cfe8f8a8b3dcd802387270442c9ebeda5 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 14:08:46 -0600 Subject: [PATCH 02/41] removed test line --- .github/workflows/smile-server.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index c628147f..d6f895b6 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -213,8 +213,6 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} tags: ${{ env.IMAGES }} workdir: ./www - IMAGES="${IMAGES}ghcr: - io/${OWNER_LC}/${IMAGE}:${tag},": - name: Publish doc image to Docker Hub if: env.DOCKERHUB_PUSH == 'true' From 6bfeb47914d5dce87668596183ca71f1b7112dcd Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 14:13:05 -0600 Subject: [PATCH 03/41] test dockerhub login --- .github/workflows/smile-server.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index d6f895b6..1781c272 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -76,12 +76,12 @@ jobs: DOCKERHUB_README="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then - if env.GITHUB_BRANCH == 'main'; then +# if env.GITHUB_BRANCH == 'main'; then DOCKERHUB_PUSH="true" if [ -e "README.md" ]; then DOCKERHUB_README="true" fi - fi +# fi fi fi From 0f777c40ba1153990babcf3d392e097978bc5c80 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 14:25:27 -0600 Subject: [PATCH 04/41] redo whole thing --- .github/workflows/smile-server.yaml | 492 +++++++++++++++++----------- 1 file changed, 303 insertions(+), 189 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 1781c272..6e169e7d 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -1,9 +1,5 @@ name: smile-server -defaults: - run: - working-directory: www - on: push: branches: @@ -15,212 +11,330 @@ on: - '*' pull_request: - branches: - - main - - develop - - 'release/*' -# Certain actions will only run when this is the main repo. env: MAIN_REPO: ncsa/standalone-smm-smile - DOCKERHUB_ORG: socialmediamacroscope - NCSAHUB: hub.ncsa.illinois.edu/socialmediamacroscope - PLATFORM: "linux/amd64" jobs: + # ---------------------------------------------------------------------- # DOCKER BUILD # ---------------------------------------------------------------------- docker: runs-on: ubuntu-latest permissions: + contents: read packages: write steps: - # checkout source code - - uses: actions/checkout@v3 - - # calculate some variables that are used later - - name: version information - run: | - # find out what the BRANCH is, in case of a PR we will use the PR- - if [ "${{ github.event.release.target_commitish }}" != "" ]; then - BRANCH="${{ github.event.release.target_commitish }}" - elif [[ $GITHUB_REF =~ pull ]]; then - BRANCH="$(echo $GITHUB_REF | sed 's#refs/pull/\([0-9]*\)/merge#PR-\1#')" - else - BRANCH=${GITHUB_REF##*/} - fi - - OWNER=${{ github.repository_owner }} - OWNER_LC=${OWNER,,} - - # calculate the version and all tags - if [ "$BRANCH" == "main" ]; then - version=$(grep '"version"' www/package.json | sed 's/.*"\([0-9\.]*\)", *$/\1/') - tags="latest" - oldversion="" - tmpversion="${VERSION}" - while [ "${oldversion}" != "${tmpversion}" ]; do - oldversion="${tmpversion}" - tags="${tags} ${tmpversion}" - tmpversion=${tmpversion%.*} - done - else - VERSION="$BRANCH" - tags="$BRANCH" - fi - - # should we push to dockerhub, and is there a README - DOCKERHUB_PUSH="false" - DOCKERHUB_README="false" - if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then -# if env.GITHUB_BRANCH == 'main'; then - DOCKERHUB_PUSH="true" - if [ -e "README.md" ]; then - DOCKERHUB_README="true" - fi -# fi - fi - fi - - # should we push to github - GITHUB_PUSH="false" - if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if env.GITHUB_BRANCH == 'develop'; then - GITHUB_PUSH="true" - fi - fi + # checkout source code + - uses: actions/checkout@v2 - # should we push to NCSA - NCSAHUB_PUSH="false" - if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ "${{ secrets.HUB_USERNAME }}" != "" -a "${{ secrets.HUB_PASSWORD }}" != "" ]; then - NCSAHUB_PUSH="true" - fi - fi + # calculate version information + - name: version information + run: | + if [ "${{ github.event.release.target_commitish }}" != "" ]; then + BRANCH="${{ github.event.release.target_commitish }}" + elif [[ "${{github.event_name}}" == "pull_request" ]]; then + BRANCH="PR-${{github.event.pull_request.number}}" + else + BRANCH=${GITHUB_REF##*/} + fi + echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV - # create a list of all images to be pushed - IMAGE="smile_server" - IMAGES="" - for tag in ${tags}; do - if [ "$DOCKERHUB_PUSH" == "true" ]; then - IMAGES="${IMAGES}${{ env.DOCKERHUB_ORG }}/${IMAGE}:${tag}," - fi - if [ "$NCSAHUB_PUSH" == "true" ]; then - IMAGES="${IMAGES}${NCSAHUB}/${IMAGE}:${tag}," - fi - if [ "$GITHUB_PUSH" == "true" ]; then - IMAGES="${IMAGES}ghcr.io/${OWNER_LC}/${IMAGE}:${tag}," - fi + if [ "$BRANCH" == "main" ]; then + VERSION=$(cat manual_jb/content/_config.yml | grep "version" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") + VERSIONS="latest" + OLDVERSION="" + TMPVERSION=$VERSION + while [ "$OLDVERSION" != "$TMPVERSION" ]; do + VERSIONS="${VERSIONS} ${TMPVERSION}" + OLDVERSION="${TMPVERSION}" + TMPVERSION=$(echo ${OLDVERSION} | sed 's/\.[0-9]*$//') done - IMAGES="${IMAGES%,*}" - - # save the results in env - echo "BRANCH=${BRANCH}" - echo "VERSION=${VERSION}" - echo "DOCKERHUB_README=${DOCKERHUB_README}" - echo "DOCKERHUB_PUSH=${DOCKERHUB_PUSH}" - echo "NCSAHUB_PUSH=${NCSAHUB_PUSH}" - echo "IMAGES=${IMAGES}" - - echo "BRANCH=${BRANCH}" >> $GITHUB_ENV - echo "VERSION=${VERSION}" >> $GITHUB_ENV - echo "DOCKERHUB_README=${DOCKERHUB_README}" >> $GITHUB_ENV - echo "DOCKERHUB_PUSH=${DOCKERHUB_PUSH}" >> $GITHUB_ENV - echo "NCSAHUB_PUSH=${NCSAHUB_PUSH}" >> $GITHUB_ENV - echo "IMAGES=${IMAGES}" >> $GITHUB_ENV - - - name: Print Images - run: echo "${{ env.IMAGES }}" - - - name: Print Version tag - run: echo "${{ env.TAGS }}" - - # setup docker build - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + echo "VERSION=$VERSION" >> $GITHUB_ENV + echo "TAGS=${VERSIONS}" >> $GITHUB_ENV + elif [ "$BRANCH" == "develop" ]; then + echo "VERSION=develop" >> $GITHUB_ENV + echo "TAGS=develop" >> $GITHUB_ENV + else + echo "VERSION=testing" >> $GITHUB_ENV + echo "TAGS=${BRANCH}" >> $GITHUB_ENV + fi - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v2 - - - name: Inspect Builder - run: | - echo "Name: ${{ steps.buildx.outputs.name }}" - echo "Endpoint: ${{ steps.buildx.outputs.endpoint }}" - echo "Status: ${{ steps.buildx.outputs.status }}" - echo "Flags: ${{ steps.buildx.outputs.flags }}" - echo "Platforms: ${{ steps.buildx.outputs.platforms }}" + - name: Print Version tag + run: echo "${{ env.TAGS }}" # login to registries - - name: Login to DockerHub - if: env.DOCKERHUB_PUSH == 'true' - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} - - - name: Login to NCSA Hub - if: env.NCSAHUB_PUSH == 'true' - uses: docker/login-action@v2 - with: - registry: hub.ncsa.illinois.edu - username: ${{ secrets.HUB_USERNAME }} - password: ${{ secrets.HUB_PASSWORD }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + - name: Login to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - # build the docker images - - name: Build and push docker - uses: docker/build-push-action@v3 - with: - context: ./www - push: true - platforms: ${{ env.PLATFORM }} - cache-from: type=gha - cache-to: type=gha - tags: ${{ env.IMAGES }} - build-args: | - BRANCH: ${{ env.BRANCH }} - VERSION=${{ env.VERSION }} - BUILDNUMBER=${{ github.run_number }} - GITSHA1=${{ github.sha }} + - name: Build docker image + if: | + github.repository == env.MAIN_REPO && + github.event_name == 'push' && + (env.GITHUB_BRANCH == 'main' || env.GITHUB_BRANCH == 'develop') + uses: elgohr/Publish-Docker-Github-Action@3.04 + with: + name: socialmediamacroscope/smile-server + no_push: true + workdir: www - # this will update the README of the dockerhub repo - - name: Docker Hub Description - if: env.DOCKERHUB_README == 'true' - uses: peter-evans/dockerhub-description@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} - repository: ${{ env.DOCKERHUB_ORG }}/${{ github.event.repository.name }} - readme-filepath: README.md + - name: Publish doc image to Docker Hub + if: | + github.repository == env.MAIN_REPO && + github.event_name == 'push' && + env.GITHUB_BRANCH == 'main' + uses: elgohr/Publish-Docker-Github-Action@3.04 + with: + registry: docker.io + name: smile-server + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + tags: "${{ env.TAGS }}" + workdir: ${{ matrix.workdir }} - - name: Publish image to Github - if: env.GITHUB_PUSH == 'true' - uses: elgohr/Publish-Docker-Github-Action@3.04 - with: - registry: ghcr.io - name: ${{ matrix.docker_repo_tag }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - tags: ${{ env.IMAGES }} - workdir: ./www + - name: Publish doc image to Github + if: | + github.repository == env.MAIN_REPO && + github.event_name == 'push' && + env.GITHUB_BRANCH == 'develop' + uses: elgohr/Publish-Docker-Github-Action@3.04 + with: + registry: ghcr.io + name: ${{ matrix.github_repo_tag }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + tags: "${{ env.TAGS }}" + workdir: ${{ matrix.workdir }} - - name: Publish doc image to Docker Hub - if: env.DOCKERHUB_PUSH == 'true' - uses: elgohr/Publish-Docker-Github-Action@3.04 - with: - registry: docker.io - name: ${{ matrix.docker_repo_tag }} - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} - tags: ${{ env.IMAGES }} - workdir: ./www \ No newline at end of file +#name: smile-server +# +#defaults: +# run: +# working-directory: www +# +#on: +# push: +# branches: +# - main +# - develop +# - 'release/*' +# +# tags: +# - '*' +# +# pull_request: +# branches: +# - main +# - develop +# - 'release/*' +# +## Certain actions will only run when this is the main repo. +#env: +# MAIN_REPO: ncsa/standalone-smm-smile +# DOCKERHUB_ORG: socialmediamacroscope +# NCSAHUB: hub.ncsa.illinois.edu/socialmediamacroscope +# PLATFORM: "linux/amd64" +# +#jobs: +# # ---------------------------------------------------------------------- +# # DOCKER BUILD +# # ---------------------------------------------------------------------- +# docker: +# runs-on: ubuntu-latest +# permissions: +# packages: write +# +# steps: +# # checkout source code +# - uses: actions/checkout@v3 +# +# # calculate some variables that are used later +# - name: version information +# run: | +# # find out what the BRANCH is, in case of a PR we will use the PR- +# if [ "${{ github.event.release.target_commitish }}" != "" ]; then +# BRANCH="${{ github.event.release.target_commitish }}" +# elif [[ $GITHUB_REF =~ pull ]]; then +# BRANCH="$(echo $GITHUB_REF | sed 's#refs/pull/\([0-9]*\)/merge#PR-\1#')" +# else +# BRANCH=${GITHUB_REF##*/} +# fi +# +# OWNER=${{ github.repository_owner }} +# OWNER_LC=${OWNER,,} +# +# # calculate the version and all tags +# if [ "$BRANCH" == "main" ]; then +# version=$(grep '"version"' www/package.json | sed 's/.*"\([0-9\.]*\)", *$/\1/') +# tags="latest" +# oldversion="" +# tmpversion="${VERSION}" +# while [ "${oldversion}" != "${tmpversion}" ]; do +# oldversion="${tmpversion}" +# tags="${tags} ${tmpversion}" +# tmpversion=${tmpversion%.*} +# done +# else +# VERSION="$BRANCH" +# tags="$BRANCH" +# fi +# +# # should we push to dockerhub, and is there a README +# DOCKERHUB_PUSH="false" +# DOCKERHUB_README="false" +# if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then +# if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then +# if env.GITHUB_BRANCH == 'main'; then +# DOCKERHUB_PUSH="true" +# if [ -e "README.md" ]; then +# DOCKERHUB_README="true" +# fi +# fi +# fi +# fi +# +# # should we push to github +# GITHUB_PUSH="false" +# if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then +# if env.GITHUB_BRANCH == 'develop'; then +# GITHUB_PUSH="true" +# fi +# fi +# +# # should we push to NCSA +# NCSAHUB_PUSH="false" +# if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then +# if [ "${{ secrets.HUB_USERNAME }}" != "" -a "${{ secrets.HUB_PASSWORD }}" != "" ]; then +# NCSAHUB_PUSH="true" +# fi +# fi +# +# # create a list of all images to be pushed +# IMAGE="smile_server" +# IMAGES="" +# for tag in ${tags}; do +# if [ "$DOCKERHUB_PUSH" == "true" ]; then +# IMAGES="${IMAGES}${{ env.DOCKERHUB_ORG }}/${IMAGE}:${tag}," +# fi +# if [ "$NCSAHUB_PUSH" == "true" ]; then +# IMAGES="${IMAGES}${NCSAHUB}/${IMAGE}:${tag}," +# fi +# if [ "$GITHUB_PUSH" == "true" ]; then +# IMAGES="${IMAGES}ghcr.io/${OWNER_LC}/${IMAGE}:${tag}," +# fi +# done +# IMAGES="${IMAGES%,*}" +# +# # save the results in env +# echo "BRANCH=${BRANCH}" +# echo "VERSION=${VERSION}" +# echo "DOCKERHUB_README=${DOCKERHUB_README}" +# echo "DOCKERHUB_PUSH=${DOCKERHUB_PUSH}" +# echo "NCSAHUB_PUSH=${NCSAHUB_PUSH}" +# echo "IMAGES=${IMAGES}" +# +# echo "BRANCH=${BRANCH}" >> $GITHUB_ENV +# echo "VERSION=${VERSION}" >> $GITHUB_ENV +# echo "DOCKERHUB_README=${DOCKERHUB_README}" >> $GITHUB_ENV +# echo "DOCKERHUB_PUSH=${DOCKERHUB_PUSH}" >> $GITHUB_ENV +# echo "NCSAHUB_PUSH=${NCSAHUB_PUSH}" >> $GITHUB_ENV +# echo "IMAGES=${IMAGES}" >> $GITHUB_ENV +# +# - name: Print Images +# run: echo "${{ env.IMAGES }}" +# +# - name: Print Version tag +# run: echo "${{ env.TAGS }}" +# +# # setup docker build +# - name: Set up QEMU +# uses: docker/setup-qemu-action@v2 +# +# - name: Set up Docker Buildx +# id: buildx +# uses: docker/setup-buildx-action@v2 +# +# - name: Inspect Builder +# run: | +# echo "Name: ${{ steps.buildx.outputs.name }}" +# echo "Endpoint: ${{ steps.buildx.outputs.endpoint }}" +# echo "Status: ${{ steps.buildx.outputs.status }}" +# echo "Flags: ${{ steps.buildx.outputs.flags }}" +# echo "Platforms: ${{ steps.buildx.outputs.platforms }}" +# +# # login to registries +# - name: Login to DockerHub +# if: env.DOCKERHUB_PUSH == 'true' +# uses: docker/login-action@v2 +# with: +# username: ${{ secrets.DOCKERHUB_USERNAME }} +# password: ${{ secrets.DOCKERHUB_PASSWORD }} +# +# - name: Login to NCSA Hub +# if: env.NCSAHUB_PUSH == 'true' +# uses: docker/login-action@v2 +# with: +# registry: hub.ncsa.illinois.edu +# username: ${{ secrets.HUB_USERNAME }} +# password: ${{ secrets.HUB_PASSWORD }} +# +# - name: Login to GitHub Container Registry +# uses: docker/login-action@v2 +# with: +# registry: ghcr.io +# username: ${{ github.actor }} +# password: ${{ secrets.GITHUB_TOKEN }} +# +# # build the docker images +# - name: Build and push docker +# uses: docker/build-push-action@v3 +# with: +# context: ./www +# push: true +# platforms: ${{ env.PLATFORM }} +# cache-from: type=gha +# cache-to: type=gha +# tags: ${{ env.IMAGES }} +# build-args: | +# BRANCH: ${{ env.BRANCH }} +# VERSION=${{ env.VERSION }} +# BUILDNUMBER=${{ github.run_number }} +# GITSHA1=${{ github.sha }} +# +# # this will update the README of the dockerhub repo +# - name: Docker Hub Description +# if: env.DOCKERHUB_README == 'true' +# uses: peter-evans/dockerhub-description@v3 +# with: +# username: ${{ secrets.DOCKERHUB_USERNAME }} +# password: ${{ secrets.DOCKERHUB_PASSWORD }} +# repository: ${{ env.DOCKERHUB_ORG }}/${{ github.event.repository.name }} +# readme-filepath: README.md +# +# - name: Publish image to Github +# if: env.GITHUB_PUSH == 'true' +# uses: elgohr/Publish-Docker-Github-Action@3.04 +# with: +# registry: ghcr.io +# name: ${{ matrix.docker_repo_tag }} +# username: ${{ github.actor }} +# password: ${{ secrets.GITHUB_TOKEN }} +# tags: ${{ env.IMAGES }} +# workdir: ./www +# +# - name: Publish doc image to Docker Hub +# if: env.DOCKERHUB_PUSH == 'true' +# uses: elgohr/Publish-Docker-Github-Action@3.04 +# with: +# registry: docker.io +# name: ${{ matrix.docker_repo_tag }} +# username: ${{ secrets.DOCKERHUB_USERNAME }} +# password: ${{ secrets.DOCKERHUB_PASSWORD }} +# tags: ${{ env.IMAGES }} +# workdir: ./www \ No newline at end of file From ebd008004f8d7521d46e48e64d76e1e4cd1145a6 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 14:29:04 -0600 Subject: [PATCH 05/41] test github action post --- .github/workflows/smile-server.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 6e169e7d..907ed78b 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -76,8 +76,8 @@ jobs: - name: Build docker image if: | github.repository == env.MAIN_REPO && - github.event_name == 'push' && - (env.GITHUB_BRANCH == 'main' || env.GITHUB_BRANCH == 'develop') + github.event_name == 'push' +# (env.GITHUB_BRANCH == 'main' || env.GITHUB_BRANCH == 'develop') uses: elgohr/Publish-Docker-Github-Action@3.04 with: name: socialmediamacroscope/smile-server @@ -101,8 +101,9 @@ jobs: - name: Publish doc image to Github if: | github.repository == env.MAIN_REPO && - github.event_name == 'push' && - env.GITHUB_BRANCH == 'develop' + github.event_name == 'push' +# github.event_name == 'push' && +# env.GITHUB_BRANCH == 'develop' uses: elgohr/Publish-Docker-Github-Action@3.04 with: registry: ghcr.io From 02246bc6116b3e27e34b84dc679df9f6aa4dcf21 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 14:34:09 -0600 Subject: [PATCH 06/41] modified version grab process --- .github/workflows/smile-server.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 907ed78b..012e7894 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -43,7 +43,7 @@ jobs: echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV if [ "$BRANCH" == "main" ]; then - VERSION=$(cat manual_jb/content/_config.yml | grep "version" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") + VERSION=$(grep '"version"' www/package.json | sed 's/.*"\([0-9\.]*\)", *$/\1/') VERSIONS="latest" OLDVERSION="" TMPVERSION=$VERSION From 408553293f33e75dfeaebaeab79767ea2f0c5fd6 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 14:37:15 -0600 Subject: [PATCH 07/41] added print outs --- .github/workflows/smile-server.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 012e7894..7078e802 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -65,6 +65,12 @@ jobs: - name: Print Version tag run: echo "${{ env.TAGS }}" + - name: Print main repo + run: echo "${{ env.MAIN_REPO }}" + + - name: Print github repo + run: echo github.repository + # login to registries - name: Login to GitHub Container Registry uses: docker/login-action@v2 From 2d62fa923a1121a3969ca17755c1314798529a30 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 14:40:12 -0600 Subject: [PATCH 08/41] test github.repository --- .github/workflows/smile-server.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 7078e802..568f8d29 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -81,7 +81,7 @@ jobs: - name: Build docker image if: | - github.repository == env.MAIN_REPO && +# github.repository == env.MAIN_REPO && github.event_name == 'push' # (env.GITHUB_BRANCH == 'main' || env.GITHUB_BRANCH == 'develop') uses: elgohr/Publish-Docker-Github-Action@3.04 From 17f7593237eaf2c845537b2e8583655a15672770 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 14:42:23 -0600 Subject: [PATCH 09/41] test 1 --- .github/workflows/smile-server.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 568f8d29..51b11602 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -81,7 +81,6 @@ jobs: - name: Build docker image if: | -# github.repository == env.MAIN_REPO && github.event_name == 'push' # (env.GITHUB_BRANCH == 'main' || env.GITHUB_BRANCH == 'develop') uses: elgohr/Publish-Docker-Github-Action@3.04 From c8f75cfe941741221560a0deb102a97127665d53 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 14:44:15 -0600 Subject: [PATCH 10/41] test 2 --- .github/workflows/smile-server.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 51b11602..23289304 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -81,7 +81,7 @@ jobs: - name: Build docker image if: | - github.event_name == 'push' + github.repository == env.MAIN_REPO # (env.GITHUB_BRANCH == 'main' || env.GITHUB_BRANCH == 'develop') uses: elgohr/Publish-Docker-Github-Action@3.04 with: From 695861ec598769c3918b5ba83aa94873bcb118ed Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 14:46:12 -0600 Subject: [PATCH 11/41] test 3 --- .github/workflows/smile-server.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 23289304..012e7894 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -65,12 +65,6 @@ jobs: - name: Print Version tag run: echo "${{ env.TAGS }}" - - name: Print main repo - run: echo "${{ env.MAIN_REPO }}" - - - name: Print github repo - run: echo github.repository - # login to registries - name: Login to GitHub Container Registry uses: docker/login-action@v2 @@ -81,7 +75,8 @@ jobs: - name: Build docker image if: | - github.repository == env.MAIN_REPO + github.repository == env.MAIN_REPO && + github.event_name == 'push' # (env.GITHUB_BRANCH == 'main' || env.GITHUB_BRANCH == 'develop') uses: elgohr/Publish-Docker-Github-Action@3.04 with: From 1207c5d33ab2bc1a2a06bd5552dd98758e7820fa Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 14:48:15 -0600 Subject: [PATCH 12/41] test 5 --- .github/workflows/smile-server.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 012e7894..d11c9d6b 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -75,8 +75,7 @@ jobs: - name: Build docker image if: | - github.repository == env.MAIN_REPO && - github.event_name == 'push' + github.repository == env.MAIN_REPO # (env.GITHUB_BRANCH == 'main' || env.GITHUB_BRANCH == 'develop') uses: elgohr/Publish-Docker-Github-Action@3.04 with: @@ -100,8 +99,7 @@ jobs: - name: Publish doc image to Github if: | - github.repository == env.MAIN_REPO && - github.event_name == 'push' + github.repository == env.MAIN_REPO # github.event_name == 'push' && # env.GITHUB_BRANCH == 'develop' uses: elgohr/Publish-Docker-Github-Action@3.04 From 5f2fc4a601da9b422dcf4b72b97f6a26915f75dd Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 14:52:46 -0600 Subject: [PATCH 13/41] test github posting --- .github/workflows/smile-server.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index d11c9d6b..4484752c 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -91,7 +91,7 @@ jobs: uses: elgohr/Publish-Docker-Github-Action@3.04 with: registry: docker.io - name: smile-server + name: socialmediamacroscope/smile-server username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} tags: "${{ env.TAGS }}" @@ -105,7 +105,7 @@ jobs: uses: elgohr/Publish-Docker-Github-Action@3.04 with: registry: ghcr.io - name: ${{ matrix.github_repo_tag }} + name: ncsa/smiles-server username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} tags: "${{ env.TAGS }}" From 1fbd495ea0f9cdb3038f492b317681448a761f2d Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 14:57:33 -0600 Subject: [PATCH 14/41] test dockerhub posting --- .github/workflows/smile-server.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 4484752c..981375a2 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -85,9 +85,9 @@ jobs: - name: Publish doc image to Docker Hub if: | - github.repository == env.MAIN_REPO && - github.event_name == 'push' && - env.GITHUB_BRANCH == 'main' + github.repository == env.MAIN_REPO +# github.event_name == 'push' && +# env.GITHUB_BRANCH == 'main' uses: elgohr/Publish-Docker-Github-Action@3.04 with: registry: docker.io @@ -99,9 +99,9 @@ jobs: - name: Publish doc image to Github if: | - github.repository == env.MAIN_REPO -# github.event_name == 'push' && -# env.GITHUB_BRANCH == 'develop' + github.repository == env.MAIN_REPO && + github.event_name == 'push' && + env.GITHUB_BRANCH == 'develop' uses: elgohr/Publish-Docker-Github-Action@3.04 with: registry: ghcr.io From df5d069690b5a227d2760cfde82771872e05ecea Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 15:49:28 -0600 Subject: [PATCH 15/41] change container name --- .github/workflows/smile-server.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 981375a2..3520af02 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -79,7 +79,7 @@ jobs: # (env.GITHUB_BRANCH == 'main' || env.GITHUB_BRANCH == 'develop') uses: elgohr/Publish-Docker-Github-Action@3.04 with: - name: socialmediamacroscope/smile-server + name: smile-server no_push: true workdir: www From ebb38171c512a95f6cd1d5928a9b2876951dbbf1 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 15:55:52 -0600 Subject: [PATCH 16/41] revert back to original --- .github/workflows/smile-server.yaml | 451 +++++++++------------------- 1 file changed, 149 insertions(+), 302 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 3520af02..568e6153 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -1,5 +1,9 @@ name: smile-server +defaults: + run: + working-directory: www + on: push: branches: @@ -11,329 +15,172 @@ on: - '*' pull_request: + branches: + - main + - develop + - 'release/*' +# Certain actions will only run when this is the main repo. env: MAIN_REPO: ncsa/standalone-smm-smile + DOCKERHUB_ORG: socialmediamacroscope + NCSAHUB: hub.ncsa.illinois.edu/socialmediamacroscope + PLATFORM: "linux/amd64" jobs: - # ---------------------------------------------------------------------- # DOCKER BUILD # ---------------------------------------------------------------------- docker: runs-on: ubuntu-latest permissions: - contents: read packages: write steps: - # checkout source code - - uses: actions/checkout@v2 + # checkout source code + - uses: actions/checkout@v3 + + # calculate some variables that are used later + - name: version information + run: | + # find out what the BRANCH is, in case of a PR we will use the PR- + if [ "${{ github.event.release.target_commitish }}" != "" ]; then + BRANCH="${{ github.event.release.target_commitish }}" + elif [[ $GITHUB_REF =~ pull ]]; then + BRANCH="$(echo $GITHUB_REF | sed 's#refs/pull/\([0-9]*\)/merge#PR-\1#')" + else + BRANCH=${GITHUB_REF##*/} + fi - # calculate version information - - name: version information - run: | - if [ "${{ github.event.release.target_commitish }}" != "" ]; then - BRANCH="${{ github.event.release.target_commitish }}" - elif [[ "${{github.event_name}}" == "pull_request" ]]; then - BRANCH="PR-${{github.event.pull_request.number}}" - else - BRANCH=${GITHUB_REF##*/} - fi - echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV + OWNER=${{ github.repository_owner }} + OWNER_LC=${OWNER,,} - if [ "$BRANCH" == "main" ]; then - VERSION=$(grep '"version"' www/package.json | sed 's/.*"\([0-9\.]*\)", *$/\1/') - VERSIONS="latest" - OLDVERSION="" - TMPVERSION=$VERSION - while [ "$OLDVERSION" != "$TMPVERSION" ]; do - VERSIONS="${VERSIONS} ${TMPVERSION}" - OLDVERSION="${TMPVERSION}" - TMPVERSION=$(echo ${OLDVERSION} | sed 's/\.[0-9]*$//') + # calculate the version and all tags + if [ "$BRANCH" == "main" ]; then + version=$(grep '"version"' www/package.json | sed 's/.*"\([0-9\.]*\)", *$/\1/') + tags="latest" + oldversion="" + tmpversion="${VERSION}" + while [ "${oldversion}" != "${tmpversion}" ]; do + oldversion="${tmpversion}" + tags="${tags} ${tmpversion}" + tmpversion=${tmpversion%.*} + done + else + VERSION="$BRANCH" + tags="$BRANCH" + fi + + # should we push to dockerhub, and is there a README + DOCKERHUB_PUSH="false" + DOCKERHUB_README="false" + if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then + if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then + DOCKERHUB_PUSH="true" + if [ -e "README.md" ]; then + DOCKERHUB_README="true" + fi + fi + fi + + # should we push to NCSA + NCSAHUB_PUSH="false" + if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then + if [ "${{ secrets.HUB_USERNAME }}" != "" -a "${{ secrets.HUB_PASSWORD }}" != "" ]; then + NCSAHUB_PUSH="true" + fi + fi + + # create a list of all images to be pushed + IMAGE="smile_server" + IMAGES="" + for tag in ${tags}; do + if [ "$DOCKERHUB_PUSH" == "true" ]; then + IMAGES="${IMAGES}${{ env.DOCKERHUB_ORG }}/${IMAGE}:${tag}," + fi + if [ "$NCSAHUB_PUSH" == "true" ]; then + IMAGES="${IMAGES}${NCSAHUB}/${IMAGE}:${tag}," + fi + IMAGES="${IMAGES}ghcr.io/${OWNER_LC}/${IMAGE}:${tag}," done - echo "VERSION=$VERSION" >> $GITHUB_ENV - echo "TAGS=${VERSIONS}" >> $GITHUB_ENV - elif [ "$BRANCH" == "develop" ]; then - echo "VERSION=develop" >> $GITHUB_ENV - echo "TAGS=develop" >> $GITHUB_ENV - else - echo "VERSION=testing" >> $GITHUB_ENV - echo "TAGS=${BRANCH}" >> $GITHUB_ENV - fi + IMAGES="${IMAGES%,*}" + + # save the results in env + echo "BRANCH=${BRANCH}" + echo "VERSION=${VERSION}" + echo "DOCKERHUB_README=${DOCKERHUB_README}" + echo "DOCKERHUB_PUSH=${DOCKERHUB_PUSH}" + echo "NCSAHUB_PUSH=${NCSAHUB_PUSH}" + echo "IMAGES=${IMAGES}" + + echo "BRANCH=${BRANCH}" >> $GITHUB_ENV + echo "VERSION=${VERSION}" >> $GITHUB_ENV + echo "DOCKERHUB_README=${DOCKERHUB_README}" >> $GITHUB_ENV + echo "DOCKERHUB_PUSH=${DOCKERHUB_PUSH}" >> $GITHUB_ENV + echo "NCSAHUB_PUSH=${NCSAHUB_PUSH}" >> $GITHUB_ENV + echo "IMAGES=${IMAGES}" >> $GITHUB_ENV + + # setup docker build + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v2 - - name: Print Version tag - run: echo "${{ env.TAGS }}" + - name: Inspect Builder + run: | + echo "Name: ${{ steps.buildx.outputs.name }}" + echo "Endpoint: ${{ steps.buildx.outputs.endpoint }}" + echo "Status: ${{ steps.buildx.outputs.status }}" + echo "Flags: ${{ steps.buildx.outputs.flags }}" + echo "Platforms: ${{ steps.buildx.outputs.platforms }}" # login to registries - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + - name: Login to DockerHub + if: env.DOCKERHUB_PUSH == 'true' + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} - - name: Build docker image - if: | - github.repository == env.MAIN_REPO -# (env.GITHUB_BRANCH == 'main' || env.GITHUB_BRANCH == 'develop') - uses: elgohr/Publish-Docker-Github-Action@3.04 - with: - name: smile-server - no_push: true - workdir: www + - name: Login to NCSA Hub + if: env.NCSAHUB_PUSH == 'true' + uses: docker/login-action@v2 + with: + registry: hub.ncsa.illinois.edu + username: ${{ secrets.HUB_USERNAME }} + password: ${{ secrets.HUB_PASSWORD }} - - name: Publish doc image to Docker Hub - if: | - github.repository == env.MAIN_REPO -# github.event_name == 'push' && -# env.GITHUB_BRANCH == 'main' - uses: elgohr/Publish-Docker-Github-Action@3.04 - with: - registry: docker.io - name: socialmediamacroscope/smile-server - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} - tags: "${{ env.TAGS }}" - workdir: ${{ matrix.workdir }} + - name: Login to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - - name: Publish doc image to Github - if: | - github.repository == env.MAIN_REPO && - github.event_name == 'push' && - env.GITHUB_BRANCH == 'develop' - uses: elgohr/Publish-Docker-Github-Action@3.04 - with: - registry: ghcr.io - name: ncsa/smiles-server - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - tags: "${{ env.TAGS }}" - workdir: ${{ matrix.workdir }} + # build the docker images + - name: Build and push docker + uses: docker/build-push-action@v3 + with: + context: ./www + push: true + platforms: ${{ env.PLATFORM }} + cache-from: type=gha + cache-to: type=gha + tags: ${{ env.IMAGES }} + build-args: | + BRANCH: ${{ env.BRANCH }} + VERSION=${{ env.VERSION }} + BUILDNUMBER=${{ github.run_number }} + GITSHA1=${{ github.sha }} -#name: smile-server -# -#defaults: -# run: -# working-directory: www -# -#on: -# push: -# branches: -# - main -# - develop -# - 'release/*' -# -# tags: -# - '*' -# -# pull_request: -# branches: -# - main -# - develop -# - 'release/*' -# -## Certain actions will only run when this is the main repo. -#env: -# MAIN_REPO: ncsa/standalone-smm-smile -# DOCKERHUB_ORG: socialmediamacroscope -# NCSAHUB: hub.ncsa.illinois.edu/socialmediamacroscope -# PLATFORM: "linux/amd64" -# -#jobs: -# # ---------------------------------------------------------------------- -# # DOCKER BUILD -# # ---------------------------------------------------------------------- -# docker: -# runs-on: ubuntu-latest -# permissions: -# packages: write -# -# steps: -# # checkout source code -# - uses: actions/checkout@v3 -# -# # calculate some variables that are used later -# - name: version information -# run: | -# # find out what the BRANCH is, in case of a PR we will use the PR- -# if [ "${{ github.event.release.target_commitish }}" != "" ]; then -# BRANCH="${{ github.event.release.target_commitish }}" -# elif [[ $GITHUB_REF =~ pull ]]; then -# BRANCH="$(echo $GITHUB_REF | sed 's#refs/pull/\([0-9]*\)/merge#PR-\1#')" -# else -# BRANCH=${GITHUB_REF##*/} -# fi -# -# OWNER=${{ github.repository_owner }} -# OWNER_LC=${OWNER,,} -# -# # calculate the version and all tags -# if [ "$BRANCH" == "main" ]; then -# version=$(grep '"version"' www/package.json | sed 's/.*"\([0-9\.]*\)", *$/\1/') -# tags="latest" -# oldversion="" -# tmpversion="${VERSION}" -# while [ "${oldversion}" != "${tmpversion}" ]; do -# oldversion="${tmpversion}" -# tags="${tags} ${tmpversion}" -# tmpversion=${tmpversion%.*} -# done -# else -# VERSION="$BRANCH" -# tags="$BRANCH" -# fi -# -# # should we push to dockerhub, and is there a README -# DOCKERHUB_PUSH="false" -# DOCKERHUB_README="false" -# if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then -# if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then -# if env.GITHUB_BRANCH == 'main'; then -# DOCKERHUB_PUSH="true" -# if [ -e "README.md" ]; then -# DOCKERHUB_README="true" -# fi -# fi -# fi -# fi -# -# # should we push to github -# GITHUB_PUSH="false" -# if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then -# if env.GITHUB_BRANCH == 'develop'; then -# GITHUB_PUSH="true" -# fi -# fi -# -# # should we push to NCSA -# NCSAHUB_PUSH="false" -# if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then -# if [ "${{ secrets.HUB_USERNAME }}" != "" -a "${{ secrets.HUB_PASSWORD }}" != "" ]; then -# NCSAHUB_PUSH="true" -# fi -# fi -# -# # create a list of all images to be pushed -# IMAGE="smile_server" -# IMAGES="" -# for tag in ${tags}; do -# if [ "$DOCKERHUB_PUSH" == "true" ]; then -# IMAGES="${IMAGES}${{ env.DOCKERHUB_ORG }}/${IMAGE}:${tag}," -# fi -# if [ "$NCSAHUB_PUSH" == "true" ]; then -# IMAGES="${IMAGES}${NCSAHUB}/${IMAGE}:${tag}," -# fi -# if [ "$GITHUB_PUSH" == "true" ]; then -# IMAGES="${IMAGES}ghcr.io/${OWNER_LC}/${IMAGE}:${tag}," -# fi -# done -# IMAGES="${IMAGES%,*}" -# -# # save the results in env -# echo "BRANCH=${BRANCH}" -# echo "VERSION=${VERSION}" -# echo "DOCKERHUB_README=${DOCKERHUB_README}" -# echo "DOCKERHUB_PUSH=${DOCKERHUB_PUSH}" -# echo "NCSAHUB_PUSH=${NCSAHUB_PUSH}" -# echo "IMAGES=${IMAGES}" -# -# echo "BRANCH=${BRANCH}" >> $GITHUB_ENV -# echo "VERSION=${VERSION}" >> $GITHUB_ENV -# echo "DOCKERHUB_README=${DOCKERHUB_README}" >> $GITHUB_ENV -# echo "DOCKERHUB_PUSH=${DOCKERHUB_PUSH}" >> $GITHUB_ENV -# echo "NCSAHUB_PUSH=${NCSAHUB_PUSH}" >> $GITHUB_ENV -# echo "IMAGES=${IMAGES}" >> $GITHUB_ENV -# -# - name: Print Images -# run: echo "${{ env.IMAGES }}" -# -# - name: Print Version tag -# run: echo "${{ env.TAGS }}" -# -# # setup docker build -# - name: Set up QEMU -# uses: docker/setup-qemu-action@v2 -# -# - name: Set up Docker Buildx -# id: buildx -# uses: docker/setup-buildx-action@v2 -# -# - name: Inspect Builder -# run: | -# echo "Name: ${{ steps.buildx.outputs.name }}" -# echo "Endpoint: ${{ steps.buildx.outputs.endpoint }}" -# echo "Status: ${{ steps.buildx.outputs.status }}" -# echo "Flags: ${{ steps.buildx.outputs.flags }}" -# echo "Platforms: ${{ steps.buildx.outputs.platforms }}" -# -# # login to registries -# - name: Login to DockerHub -# if: env.DOCKERHUB_PUSH == 'true' -# uses: docker/login-action@v2 -# with: -# username: ${{ secrets.DOCKERHUB_USERNAME }} -# password: ${{ secrets.DOCKERHUB_PASSWORD }} -# -# - name: Login to NCSA Hub -# if: env.NCSAHUB_PUSH == 'true' -# uses: docker/login-action@v2 -# with: -# registry: hub.ncsa.illinois.edu -# username: ${{ secrets.HUB_USERNAME }} -# password: ${{ secrets.HUB_PASSWORD }} -# -# - name: Login to GitHub Container Registry -# uses: docker/login-action@v2 -# with: -# registry: ghcr.io -# username: ${{ github.actor }} -# password: ${{ secrets.GITHUB_TOKEN }} -# -# # build the docker images -# - name: Build and push docker -# uses: docker/build-push-action@v3 -# with: -# context: ./www -# push: true -# platforms: ${{ env.PLATFORM }} -# cache-from: type=gha -# cache-to: type=gha -# tags: ${{ env.IMAGES }} -# build-args: | -# BRANCH: ${{ env.BRANCH }} -# VERSION=${{ env.VERSION }} -# BUILDNUMBER=${{ github.run_number }} -# GITSHA1=${{ github.sha }} -# -# # this will update the README of the dockerhub repo -# - name: Docker Hub Description -# if: env.DOCKERHUB_README == 'true' -# uses: peter-evans/dockerhub-description@v3 -# with: -# username: ${{ secrets.DOCKERHUB_USERNAME }} -# password: ${{ secrets.DOCKERHUB_PASSWORD }} -# repository: ${{ env.DOCKERHUB_ORG }}/${{ github.event.repository.name }} -# readme-filepath: README.md -# -# - name: Publish image to Github -# if: env.GITHUB_PUSH == 'true' -# uses: elgohr/Publish-Docker-Github-Action@3.04 -# with: -# registry: ghcr.io -# name: ${{ matrix.docker_repo_tag }} -# username: ${{ github.actor }} -# password: ${{ secrets.GITHUB_TOKEN }} -# tags: ${{ env.IMAGES }} -# workdir: ./www -# -# - name: Publish doc image to Docker Hub -# if: env.DOCKERHUB_PUSH == 'true' -# uses: elgohr/Publish-Docker-Github-Action@3.04 -# with: -# registry: docker.io -# name: ${{ matrix.docker_repo_tag }} -# username: ${{ secrets.DOCKERHUB_USERNAME }} -# password: ${{ secrets.DOCKERHUB_PASSWORD }} -# tags: ${{ env.IMAGES }} -# workdir: ./www \ No newline at end of file + # this will update the README of the dockerhub repo + - name: Docker Hub Description + if: env.DOCKERHUB_README == 'true' + uses: peter-evans/dockerhub-description@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + repository: ${{ env.DOCKERHUB_ORG }}/${{ github.event.repository.name }} + readme-filepath: README.md From 517fe8f451029bf3f1e9c0350d7007e250514f62 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 16:02:29 -0600 Subject: [PATCH 17/41] added docker hub push only to main --- .github/workflows/smile-server.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 568e6153..716e65fe 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -75,10 +75,12 @@ jobs: DOCKERHUB_PUSH="false" DOCKERHUB_README="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then - DOCKERHUB_PUSH="true" - if [ -e "README.md" ]; then - DOCKERHUB_README="true" + if [ "${{ env.GITHUB_BRANCH == 'main' }}" ]; then + if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then + DOCKERHUB_PUSH="true" + if [ -e "README.md" ]; then + DOCKERHUB_README="true" + fi fi fi fi From 7262ca7381e044a2e1b000be23113143b75be821 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 16:16:07 -0600 Subject: [PATCH 18/41] added branch info to env variable --- .github/workflows/smile-server.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 716e65fe..77e3f6b3 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -70,6 +70,8 @@ jobs: VERSION="$BRANCH" tags="$BRANCH" fi + + echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV # should we push to dockerhub, and is there a README DOCKERHUB_PUSH="false" From 7b80c13a4f216733f427f2ea7de0e080bae6422d Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 16:21:35 -0600 Subject: [PATCH 19/41] test1 --- .github/workflows/smile-server.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 77e3f6b3..6439f947 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -90,8 +90,10 @@ jobs: # should we push to NCSA NCSAHUB_PUSH="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ "${{ secrets.HUB_USERNAME }}" != "" -a "${{ secrets.HUB_PASSWORD }}" != "" ]; then - NCSAHUB_PUSH="true" + if [ "${{ env.GITHUB_BRANCH == 'develop' }}" ]; then + if [ "${{ secrets.HUB_USERNAME }}" != "" -a "${{ secrets.HUB_PASSWORD }}" != "" ]; then + NCSAHUB_PUSH="true" + fi fi fi @@ -124,6 +126,9 @@ jobs: echo "NCSAHUB_PUSH=${NCSAHUB_PUSH}" >> $GITHUB_ENV echo "IMAGES=${IMAGES}" >> $GITHUB_ENV + - name: Print DOCKERHUB_PUSH + run: echo "${{ env.TAGS }}" + # setup docker build - name: Set up QEMU uses: docker/setup-qemu-action@v2 From ef9827f4c8647445e31f2bf793acd182518c8619 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 16:31:43 -0600 Subject: [PATCH 20/41] test2 --- .github/workflows/smile-server.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 6439f947..4a935bf7 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -126,8 +126,8 @@ jobs: echo "NCSAHUB_PUSH=${NCSAHUB_PUSH}" >> $GITHUB_ENV echo "IMAGES=${IMAGES}" >> $GITHUB_ENV - - name: Print DOCKERHUB_PUSH - run: echo "${{ env.TAGS }}" + - name: Print Github branch + run: echo "${{ env.GITHUB_BRANCH }}" # setup docker build - name: Set up QEMU From d724b1e08cebb14184c5fb325902f86f31cc4f5e Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 16:37:51 -0600 Subject: [PATCH 21/41] test3 --- .github/workflows/smile-server.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 4a935bf7..a91859b7 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -77,7 +77,7 @@ jobs: DOCKERHUB_PUSH="false" DOCKERHUB_README="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ "${{ env.GITHUB_BRANCH == 'main' }}" ]; then + if [ "${{ env.GITHUB_BRANCH }}" == "main" ]; then if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then DOCKERHUB_PUSH="true" if [ -e "README.md" ]; then From e49277ca5a4a9d462669358e6eb0d20c9d3d0d4d Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 16:59:17 -0600 Subject: [PATCH 22/41] test4 --- .github/workflows/smile-server.yaml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index a91859b7..712b2029 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -86,11 +86,19 @@ jobs: fi fi fi + + # should we push to Github + GITHUB_PUSH="false" + if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then + if [ "${{ env.GITHUB_BRANCH }}" == "develop" ]; then + GITHUB_PUSH="true" + fi + fi # should we push to NCSA NCSAHUB_PUSH="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ "${{ env.GITHUB_BRANCH == 'develop' }}" ]; then + if [ "${{ env.GITHUB_BRANCH }}" == "main" ]; then if [ "${{ secrets.HUB_USERNAME }}" != "" -a "${{ secrets.HUB_PASSWORD }}" != "" ]; then NCSAHUB_PUSH="true" fi @@ -107,7 +115,9 @@ jobs: if [ "$NCSAHUB_PUSH" == "true" ]; then IMAGES="${IMAGES}${NCSAHUB}/${IMAGE}:${tag}," fi - IMAGES="${IMAGES}ghcr.io/${OWNER_LC}/${IMAGE}:${tag}," + if [ "$GITHUB_PUSH" == "true" ]; then + IMAGES="${IMAGES}ghcr.io/${OWNER_LC}/${IMAGE}:${tag}," + fi done IMAGES="${IMAGES%,*}" @@ -117,6 +127,7 @@ jobs: echo "DOCKERHUB_README=${DOCKERHUB_README}" echo "DOCKERHUB_PUSH=${DOCKERHUB_PUSH}" echo "NCSAHUB_PUSH=${NCSAHUB_PUSH}" + echo "GITHUB_PUSH=${GITHUB_PUSH}" echo "IMAGES=${IMAGES}" echo "BRANCH=${BRANCH}" >> $GITHUB_ENV From 1afd3d5e76cd3f30e46b4cb18a32baa514758142 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 17:02:51 -0600 Subject: [PATCH 23/41] test4 --- .github/workflows/smile-server.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 712b2029..97d20be4 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -181,6 +181,7 @@ jobs: # build the docker images - name: Build and push docker + if: env.DOCKERHUB_PUSH == 'true' || env.NCSAHUB_PUSH == 'true' || env.GITHUB_PUSH == 'true' uses: docker/build-push-action@v3 with: context: ./www From dd5e493f4ddeee3e0bdf0b14d8b4bfff2ae172ee Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 17:05:17 -0600 Subject: [PATCH 24/41] test5 --- .github/workflows/smile-server.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 97d20be4..7649538f 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -77,7 +77,7 @@ jobs: DOCKERHUB_PUSH="false" DOCKERHUB_README="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ "${{ env.GITHUB_BRANCH }}" == "main" ]; then + if [ "${{ env.GITHUB_BRANCH }}" == "PR-116" ]; then if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then DOCKERHUB_PUSH="true" if [ -e "README.md" ]; then @@ -90,7 +90,7 @@ jobs: # should we push to Github GITHUB_PUSH="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ "${{ env.GITHUB_BRANCH }}" == "develop" ]; then + if [ "${{ env.GITHUB_BRANCH }}" == "PR-116" ]; then GITHUB_PUSH="true" fi fi From c886731d0defff9bf9779ded8d24a6eb248783cd Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 17:12:10 -0600 Subject: [PATCH 25/41] test6 --- .github/workflows/smile-server.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 7649538f..3d4d3e5b 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -77,12 +77,10 @@ jobs: DOCKERHUB_PUSH="false" DOCKERHUB_README="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ "${{ env.GITHUB_BRANCH }}" == "PR-116" ]; then - if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then - DOCKERHUB_PUSH="true" - if [ -e "README.md" ]; then - DOCKERHUB_README="true" - fi + if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then + DOCKERHUB_PUSH="true" + if [ -e "README.md" ]; then + DOCKERHUB_README="true" fi fi fi From ecbbf1abb0f4b63153fc74b102a92de87850b354 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 17:15:06 -0600 Subject: [PATCH 26/41] test7 --- .github/workflows/smile-server.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 3d4d3e5b..fa0a88e7 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -77,10 +77,14 @@ jobs: DOCKERHUB_PUSH="false" DOCKERHUB_README="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then - DOCKERHUB_PUSH="true" - if [ -e "README.md" ]; then - DOCKERHUB_README="true" + echo "GITHUB_REPO=${{ github.repository }}" + echo "PR-116" + if [ "${{ env.GITHUB_BRANCH }}" == "PR-116" ]; then + if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then + DOCKERHUB_PUSH="true" + if [ -e "README.md" ]; then + DOCKERHUB_README="true" + fi fi fi fi From 54bb31144ce5cc3634976da5cdfd8c3dbc596e63 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 17:18:34 -0600 Subject: [PATCH 27/41] test8 --- .github/workflows/smile-server.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index fa0a88e7..488eab7a 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -77,7 +77,7 @@ jobs: DOCKERHUB_PUSH="false" DOCKERHUB_README="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - echo "GITHUB_REPO=${{ github.repository }}" + echo "env.GITHUB_BRANCH" echo "PR-116" if [ "${{ env.GITHUB_BRANCH }}" == "PR-116" ]; then if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then From 403a1c2f3f14c1b5903d0c13bee7eafa637d121b Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 17:23:59 -0600 Subject: [PATCH 28/41] test9 --- .github/workflows/smile-server.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 488eab7a..5ee9a9b5 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -40,6 +40,14 @@ jobs: # checkout source code - uses: actions/checkout@v3 + - name: Check Condition + run: | + if [ "${{ env.GITHUB_BRANCH }}" == "PR-116" ]; then + echo "Condition is true" + else + echo "Condition is false" + fi + # calculate some variables that are used later - name: version information run: | From 4303b64d178f4f960ecc0715e38e497c4ecbcea7 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 17:28:45 -0600 Subject: [PATCH 29/41] test10 --- .github/workflows/smile-server.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 5ee9a9b5..0b41cffd 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -42,7 +42,7 @@ jobs: - name: Check Condition run: | - if [ "${{ env.GITHUB_BRANCH }}" == "PR-116" ]; then + if [ "${BRANCH}" == "PR-116" ]; then echo "Condition is true" else echo "Condition is false" From 7aca136c5ef2a4a49dea335508a203f5a0e9f6aa Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 17:29:59 -0600 Subject: [PATCH 30/41] test11 --- .github/workflows/smile-server.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 0b41cffd..1de46aeb 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -42,7 +42,7 @@ jobs: - name: Check Condition run: | - if [ "${BRANCH}" == "PR-116" ]; then + if [ "$BRANCH" == "PR-116" ]; then echo "Condition is true" else echo "Condition is false" From 9984f17402fbd347b54468cfd8212a0390f206e4 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 17:32:00 -0600 Subject: [PATCH 31/41] test12 --- .github/workflows/smile-server.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 1de46aeb..f0e3e15a 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -45,7 +45,7 @@ jobs: if [ "$BRANCH" == "PR-116" ]; then echo "Condition is true" else - echo "Condition is false" + echo "$BRANCH" fi # calculate some variables that are used later From 9d28e7be6498867097a128b8ae1cfa74217fda66 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 17:35:56 -0600 Subject: [PATCH 32/41] test13 --- .github/workflows/smile-server.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index f0e3e15a..bb695b47 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -45,7 +45,7 @@ jobs: if [ "$BRANCH" == "PR-116" ]; then echo "Condition is true" else - echo "$BRANCH" + echo "Condition is false" fi # calculate some variables that are used later @@ -85,9 +85,9 @@ jobs: DOCKERHUB_PUSH="false" DOCKERHUB_README="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - echo "env.GITHUB_BRANCH" + echo ${BRANCH} echo "PR-116" - if [ "${{ env.GITHUB_BRANCH }}" == "PR-116" ]; then + if [ ${BRANCH} == "PR-116" ]; then if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then DOCKERHUB_PUSH="true" if [ -e "README.md" ]; then From 9554d98919440002e440c8b787b737c911fa73f9 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 17:38:26 -0600 Subject: [PATCH 33/41] test15 --- .github/workflows/smile-server.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index bb695b47..3e25c068 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -42,7 +42,7 @@ jobs: - name: Check Condition run: | - if [ "$BRANCH" == "PR-116" ]; then + if [ ${BRANCH} == "PR-116" ]; then echo "Condition is true" else echo "Condition is false" @@ -85,8 +85,6 @@ jobs: DOCKERHUB_PUSH="false" DOCKERHUB_README="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - echo ${BRANCH} - echo "PR-116" if [ ${BRANCH} == "PR-116" ]; then if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then DOCKERHUB_PUSH="true" @@ -100,7 +98,7 @@ jobs: # should we push to Github GITHUB_PUSH="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ "${{ env.GITHUB_BRANCH }}" == "PR-116" ]; then + if [ ${BRANCH} == "PR-116" ]; then GITHUB_PUSH="true" fi fi @@ -108,7 +106,7 @@ jobs: # should we push to NCSA NCSAHUB_PUSH="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ "${{ env.GITHUB_BRANCH }}" == "main" ]; then + if [ ${BRANCH} == "PR-116" ]; then if [ "${{ secrets.HUB_USERNAME }}" != "" -a "${{ secrets.HUB_PASSWORD }}" != "" ]; then NCSAHUB_PUSH="true" fi From e942f66040255b95f8caa38897b62fc68df4a532 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 17:42:27 -0600 Subject: [PATCH 34/41] test16 --- .github/workflows/smile-server.yaml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 3e25c068..d7a767f4 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -85,7 +85,7 @@ jobs: DOCKERHUB_PUSH="false" DOCKERHUB_README="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ ${BRANCH} == "PR-116" ]; then + if [ ${BRANCH} == "main" ]; then if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then DOCKERHUB_PUSH="true" if [ -e "README.md" ]; then @@ -98,7 +98,7 @@ jobs: # should we push to Github GITHUB_PUSH="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ ${BRANCH} == "PR-116" ]; then + if [ ${BRANCH} == "develop" ]; then GITHUB_PUSH="true" fi fi @@ -106,10 +106,8 @@ jobs: # should we push to NCSA NCSAHUB_PUSH="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ ${BRANCH} == "PR-116" ]; then - if [ "${{ secrets.HUB_USERNAME }}" != "" -a "${{ secrets.HUB_PASSWORD }}" != "" ]; then - NCSAHUB_PUSH="true" - fi + if [ "${{ secrets.HUB_USERNAME }}" != "" -a "${{ secrets.HUB_PASSWORD }}" != "" ]; then + NCSAHUB_PUSH="true" fi fi @@ -145,6 +143,13 @@ jobs: echo "NCSAHUB_PUSH=${NCSAHUB_PUSH}" >> $GITHUB_ENV echo "IMAGES=${IMAGES}" >> $GITHUB_ENV + - name: versiont test + run: if [ "$BRANCH" == "PR-116" ]; then + echo "main" + else + echo "not main" + fi + - name: Print Github branch run: echo "${{ env.GITHUB_BRANCH }}" From 347d45f55bc6d9cbf2a9f88a84a163a79856f93c Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 17:44:36 -0600 Subject: [PATCH 35/41] test17 --- .github/workflows/smile-server.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index d7a767f4..b22a38c5 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -143,12 +143,13 @@ jobs: echo "NCSAHUB_PUSH=${NCSAHUB_PUSH}" >> $GITHUB_ENV echo "IMAGES=${IMAGES}" >> $GITHUB_ENV - - name: versiont test - run: if [ "$BRANCH" == "PR-116" ]; then - echo "main" - else - echo "not main" - fi + - name: version test + run: | + if [ "$BRANCH" == "PR-116" ]; then + echo "main" + else + echo "not main" + fi - name: Print Github branch run: echo "${{ env.GITHUB_BRANCH }}" From 4ec9b0a5cc1e39f5e4dd72ae7105fcdbf127cd55 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 17:51:19 -0600 Subject: [PATCH 36/41] test18 --- .github/workflows/smile-server.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index b22a38c5..27fd4afd 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -42,7 +42,7 @@ jobs: - name: Check Condition run: | - if [ ${BRANCH} == "PR-116" ]; then + if [ "$BRANCH" == "PR-116" ]; then echo "Condition is true" else echo "Condition is false" @@ -151,9 +151,6 @@ jobs: echo "not main" fi - - name: Print Github branch - run: echo "${{ env.GITHUB_BRANCH }}" - # setup docker build - name: Set up QEMU uses: docker/setup-qemu-action@v2 From 4eced9971d05d0969382268c18feee89a18667f1 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 17 Jan 2024 17:54:35 -0600 Subject: [PATCH 37/41] modified changelog --- .github/workflows/smile-server.yaml | 16 ---------------- CHANGELOG.md | 1 + 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index 27fd4afd..e1070fb3 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -40,14 +40,6 @@ jobs: # checkout source code - uses: actions/checkout@v3 - - name: Check Condition - run: | - if [ "$BRANCH" == "PR-116" ]; then - echo "Condition is true" - else - echo "Condition is false" - fi - # calculate some variables that are used later - name: version information run: | @@ -143,14 +135,6 @@ jobs: echo "NCSAHUB_PUSH=${NCSAHUB_PUSH}" >> $GITHUB_ENV echo "IMAGES=${IMAGES}" >> $GITHUB_ENV - - name: version test - run: | - if [ "$BRANCH" == "PR-116" ]; then - echo "main" - else - echo "not main" - fi - # setup docker build - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index c7a19612..949d4ff5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added - Google Analytics 4 tag for user analysis [#107](https://github.com/ncsa/standalone-smm-smile/issues/107) +- Github action to publish to different docker registry [#106](https://github.com/ncsa/standalone-smm-smile/issues/106) ## [0.3.1] - 2023-10-12 ### Changed From 732d72cd9c19855c2640d811bdd166f0c80d5472 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Thu, 18 Jan 2024 14:43:33 -0600 Subject: [PATCH 38/41] removed cheking for posting to github --- .github/workflows/smile-server.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index e1070fb3..b1fc821a 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -90,9 +90,7 @@ jobs: # should we push to Github GITHUB_PUSH="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ ${BRANCH} == "develop" ]; then GITHUB_PUSH="true" - fi fi # should we push to NCSA From 9c43660030bc6b872077e5a1a7d2a3f839b40cef Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Fri, 19 Jan 2024 14:12:54 -0600 Subject: [PATCH 39/41] test 1 --- .github/workflows/smile-server.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index b1fc821a..a8cf68fd 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -77,7 +77,7 @@ jobs: DOCKERHUB_PUSH="false" DOCKERHUB_README="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ ${BRANCH} == "main" ]; then + if [ ${BRANCH} == "PR-116" ]; then if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then DOCKERHUB_PUSH="true" if [ -e "README.md" ]; then @@ -90,7 +90,9 @@ jobs: # should we push to Github GITHUB_PUSH="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then + if [ ${BRANCH} == "PR-116" ]; then GITHUB_PUSH="true" + fi fi # should we push to NCSA From 7486ba1f276b82073dbf0b336187df4990c2648d Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Fri, 19 Jan 2024 14:15:44 -0600 Subject: [PATCH 40/41] retreived to original --- .github/workflows/smile-server.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index a8cf68fd..b1fc821a 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -77,7 +77,7 @@ jobs: DOCKERHUB_PUSH="false" DOCKERHUB_README="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ ${BRANCH} == "PR-116" ]; then + if [ ${BRANCH} == "main" ]; then if [ "${{ secrets.DOCKERHUB_USERNAME }}" != "" -a "${{ secrets.DOCKERHUB_PASSWORD }}" != "" ]; then DOCKERHUB_PUSH="true" if [ -e "README.md" ]; then @@ -90,9 +90,7 @@ jobs: # should we push to Github GITHUB_PUSH="false" if [ "${{ github.repository }}" == "${{ env.MAIN_REPO }}" ]; then - if [ ${BRANCH} == "PR-116" ]; then GITHUB_PUSH="true" - fi fi # should we push to NCSA From c58156b8cd52310d157b5fdc22e2737392111a7d Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Fri, 19 Jan 2024 14:21:13 -0600 Subject: [PATCH 41/41] fixed the issue in dockerhub --- .github/workflows/smile-server.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/smile-server.yaml b/.github/workflows/smile-server.yaml index b1fc821a..6363ba77 100644 --- a/.github/workflows/smile-server.yaml +++ b/.github/workflows/smile-server.yaml @@ -130,6 +130,7 @@ jobs: echo "VERSION=${VERSION}" >> $GITHUB_ENV echo "DOCKERHUB_README=${DOCKERHUB_README}" >> $GITHUB_ENV echo "DOCKERHUB_PUSH=${DOCKERHUB_PUSH}" >> $GITHUB_ENV + echo "GITHUB_PUSH=${GITHUB_PUSH}" >> $GITHUB_ENV echo "NCSAHUB_PUSH=${NCSAHUB_PUSH}" >> $GITHUB_ENV echo "IMAGES=${IMAGES}" >> $GITHUB_ENV