diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml index c34c5d0a6..6bfd7dcb9 100644 --- a/.github/workflows/build-dev.yaml +++ b/.github/workflows/build-dev.yaml @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@v3.x + uses: rlespinasse/github-slug-action@v4 - name: Initialise workflow variables id: vars run: | @@ -49,8 +49,8 @@ jobs: echo FE_NAMESPACE=${FE_NAMESPACE} echo "FE_NAMESPACE=${FE_NAMESPACE}" >> $GITHUB_OUTPUT - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: tags: ${{ steps.vars.outputs.FE_NAMESPACE }}/fragalysis-frontend:${{ env.GITHUB_REF_SLUG }} diff --git a/.github/workflows/build-production.yaml b/.github/workflows/build-production.yaml index 5b59b42ba..594f619d7 100644 --- a/.github/workflows/build-production.yaml +++ b/.github/workflows/build-production.yaml @@ -66,19 +66,13 @@ jobs: push: ${{ steps.vars.outputs.push }} steps: - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@v3.x + uses: rlespinasse/github-slug-action@v4 - name: Initialise workflow variables id: vars env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} TRIGGER_DOWNSTREAM: ${{ secrets.TRIGGER_DOWNSTREAM }} run: | - # BE_IMAGE_TAG - BE_IMAGE_TAG="${{ env.BE_IMAGE_TAG }}" - if [ -n "${{ secrets.BE_IMAGE_TAG }}" ]; then BE_IMAGE_TAG="${{ secrets.BE_IMAGE_TAG }}"; fi - echo BE_IMAGE_TAG=${BE_IMAGE_TAG} - echo "BE_IMAGE_TAG=${BE_IMAGE_TAG}" >> $GITHUB_OUTPUT - # BE_NAMESPACE BE_NAMESPACE="${{ env.BE_NAMESPACE }}" if [ -n "${{ secrets.BE_NAMESPACE }}" ]; then BE_NAMESPACE="${{ secrets.BE_NAMESPACE }}"; fi @@ -88,7 +82,7 @@ jobs: # FE_IMAGE_TAG FE_IMAGE_TAG="${{ env.FE_IMAGE_TAG }}" if [ -n "${{ secrets.FE_IMAGE_TAG }}" ]; then FE_IMAGE_TAG="${{ secrets.FE_IMAGE_TAG }}"; fi - echo FE_IMAGE_TAG={FE_IMAGE_TAG} + echo FE_IMAGE_TAG=${FE_IMAGE_TAG} echo "FE_IMAGE_TAG=${FE_IMAGE_TAG}" >> $GITHUB_OUTPUT # FE_NAMESPACE @@ -115,6 +109,12 @@ jobs: echo STACK_NAMESPACE=${STACK_NAMESPACE} echo "STACK_NAMESPACE=${STACK_NAMESPACE}" >> $GITHUB_OUTPUT + # What image tag are we using? 'latest' (if not tagged) or a GitHub tag? + TAG="latest" + if [[ "${{ github.ref }}" =~ ^refs/tags/ ]]; then TAG="${{ env.GITHUB_REF_SLUG }}"; fi + echo tag=${TAG} + echo "tag=${TAG}" >> $GITHUB_OUTPUT + # Do we push, i.e. is DOCKERHUB_USERNAME defined? echo push=${{ env.DOCKERHUB_USERNAME != '' }} echo "push=${{ env.DOCKERHUB_USERNAME != '' }}" >> $GITHUB_OUTPUT @@ -124,12 +124,15 @@ jobs: echo "trigger=${{ env.TRIGGER_DOWNSTREAM == 'yes' }}" >> $GITHUB_OUTPUT - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: - tags: ${{ steps.vars.outputs.FE_NAMESPACE }}/fragalysis-frontend:${{ steps.vars.outputs.FE_IMAGE_TAG }} - - name: Login to Docker Hub + context: . + tags: | + ${{ steps.vars.outputs.FE_NAMESPACE }}/fragalysis-frontend:${{ steps.vars.outputs.tag }} + ${{ steps.vars.outputs.FE_NAMESPACE }}/fragalysis-frontend:stable + - name: Login to DockerHub if: steps.vars.outputs.push == 'true' uses: docker/login-action@v3 with: @@ -138,7 +141,8 @@ jobs: - name: Push if: steps.vars.outputs.push == 'true' run: | - docker push ${{ steps.vars.outputs.FE_NAMESPACE }}/fragalysis-frontend:${{ steps.vars.outputs.FE_IMAGE_TAG }} + docker push ${{ steps.vars.outputs.FE_NAMESPACE }}/fragalysis-frontend:${{ steps.vars.outputs.tag }} + docker push ${{ steps.vars.outputs.FE_NAMESPACE }}/fragalysis-frontend:stable # Trigger the stack for this build, # identifying the 'stable' backend (or whatever BE_IMAGE_TAG was used) diff --git a/.github/workflows/build-staging.yaml b/.github/workflows/build-staging.yaml index df2f753a4..fe2d9e188 100644 --- a/.github/workflows/build-staging.yaml +++ b/.github/workflows/build-staging.yaml @@ -71,7 +71,7 @@ jobs: push: ${{ steps.vars.outputs.push }} steps: - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@v3.x + uses: rlespinasse/github-slug-action@v4 - name: Initialise workflow variables id: vars env: @@ -120,6 +120,12 @@ jobs: echo STACK_NAMESPACE=${STACK_NAMESPACE} echo "STACK_NAMESPACE=${STACK_NAMESPACE}" >> $GITHUB_OUTPUT + # What image tag are we using? 'latest' (if not tagged) or a GitHub tag? + TAG="latest" + if [[ "${{ github.ref }}" =~ ^refs/tags/ ]]; then TAG="${{ env.GITHUB_REF_SLUG }}"; fi + echo tag=${TAG} + echo "tag=${TAG}" >> $GITHUB_OUTPUT + # Do we push, i.e. is DOCKERHUB_USERNAME defined? echo push=${{ env.DOCKERHUB_USERNAME != '' }} echo "push=${{ env.DOCKERHUB_USERNAME != '' }}" >> $GITHUB_OUTPUT @@ -129,11 +135,12 @@ jobs: echo "trigger=${{ env.TRIGGER_DOWNSTREAM == 'yes' }}" >> $GITHUB_OUTPUT - name: Checkout - uses: actions/checkout@v3 - - name: Build - uses: docker/build-push-action@v4 + uses: actions/checkout@v4 + - name: Docker build + uses: docker/build-push-action@v5 with: - tags: ${{ steps.vars.outputs.FE_NAMESPACE }}/fragalysis-frontend:${{ steps.vars.outputs.FE_IMAGE_TAG }} + context: . + tags: ${{ steps.vars.outputs.FE_NAMESPACE }}/fragalysis-frontend:${{ steps.vars.outputs.tag }} - name: Login to Docker Hub if: steps.vars.outputs.push == 'true' uses: docker/login-action@v3 @@ -142,8 +149,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Push if: steps.vars.outputs.push == 'true' - run: | - docker push ${{ steps.vars.outputs.FE_NAMESPACE }}/fragalysis-frontend:${{ steps.vars.outputs.FE_IMAGE_TAG }} + run: docker push ${{ steps.vars.outputs.FE_NAMESPACE }}/fragalysis-frontend:${{ steps.vars.outputs.tag }} # Trigger the stack for this build, # identifying the 'stable' backend (or whatever BE_IMAGE_TAG has been set) diff --git a/docker-compose.dev.vector.yml b/docker-compose.dev.vector.yml index 272e4b83f..e9238a97c 100644 --- a/docker-compose.dev.vector.yml +++ b/docker-compose.dev.vector.yml @@ -53,10 +53,10 @@ services: start_period: 10s web: container_name: web_dock - image: xchem/fragalysis-stack:latest + # image: xchem/fragalysis-stack:latest # image: alanbchristie/fragalysis-backend:1187.3 # image: boriskovarm2ms/fragalysis-stack:experiment2 - # image: kaliif/fragalysis-backend:latest + image: kaliif/fragalysis-backend:latest command: /bin/bash /code/launch-stack.sh volumes: - ../data/logs:/code/logs/ diff --git a/js/components/preview/tags/details/tagDetails.js b/js/components/preview/tags/details/tagDetails.js index 835f52a60..2f814f0b8 100644 --- a/js/components/preview/tags/details/tagDetails.js +++ b/js/components/preview/tags/details/tagDetails.js @@ -201,8 +201,8 @@ const TagDetails = memo(() => { const moleculesToEditIds = useSelector(state => state.selectionReducers.moleculesToEdit); const moleculesToEdit = moleculesToEditIds && - moleculesToEditIds.length > 0 && - !(moleculesToEditIds.length === 1 && moleculesToEditIds[0] === null) + moleculesToEditIds.length > 0 && + !(moleculesToEditIds.length === 1 && moleculesToEditIds[0] === null) ? moleculesToEditIds.map(id => dispatch(getMoleculeForId(id))) : [];