From 020096cef88b0727ecedbf624e90a22aeb1e75a8 Mon Sep 17 00:00:00 2001 From: Shahzad Chaudhry Date: Thu, 11 Jan 2024 09:42:29 +0000 Subject: [PATCH] Nit 1015 alfresco move existing share gh workflow to dev repo (#22) * NIT-1015 Share GH workflow to move to hmpps-alfresco repo * NIT-1015 Share GH workflow to move to hmpps-alfresco repo --- .../cloud-platform-build-push-share.yml | 41 ------------------- .../cloud-platform-deploy-release.yml | 4 -- alfresco-content-services/values.yaml | 2 +- docker-files/Dockerfile-share | 16 -------- docker-files/README.md | 2 - 5 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 .github/workflows/cloud-platform-build-push-share.yml delete mode 100644 docker-files/Dockerfile-share delete mode 100644 docker-files/README.md diff --git a/.github/workflows/cloud-platform-build-push-share.yml b/.github/workflows/cloud-platform-build-push-share.yml deleted file mode 100644 index 4a13719..0000000 --- a/.github/workflows/cloud-platform-build-push-share.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: cloud-platform-build-push-share - -on: - push: - branches: [main] - paths: - - 'docker-files/Dockerfile-share' - - '.github/workflows/cloud-platform-build-push-share.yml' - -jobs: - build-and-push: - runs-on: ubuntu-latest - permissions: - id-token: write # This is required for requesting the JWT - contents: read # This is required for actions/checkout - steps: - - name: Checkout current repo - uses: actions/checkout@v3 - - - name: Configure aws credentials for ECR - uses: aws-actions/configure-aws-credentials@v4.0.1 - with: - role-to-assume: ${{ secrets.SHARE_ECR_ROLE_TO_ASSUME }} - aws-region: ${{ vars.SHARE_ECR_REGION }} - - - name: ECR login - uses: aws-actions/amazon-ecr-login@v2 - id: login-ecr - - - name: Alfresco Enterprise image repository login - run: docker login quay.io -u ${{ secrets.ALFRESCO_QUAY_IO_USERNAME }} -p ${{ secrets.ALFRESCO_QUAY_IO_PASSWORD }} - - - name: Build image and push to ECR - working-directory: ./docker-files - run: | - docker build -t $REGISTRY/$REPOSITORY:$IMAGE_TAG . -f Dockerfile-share - docker push $REGISTRY/$REPOSITORY:$IMAGE_TAG - env: - REGISTRY: ${{ steps.login-ecr.outputs.registry }} - REPOSITORY: ${{ vars.SHARE_ECR_REPOSITORY }} - IMAGE_TAG: ${{ github.sha }} diff --git a/.github/workflows/cloud-platform-deploy-release.yml b/.github/workflows/cloud-platform-deploy-release.yml index 5f5c3bc..8fb3ada 100644 --- a/.github/workflows/cloud-platform-deploy-release.yml +++ b/.github/workflows/cloud-platform-deploy-release.yml @@ -3,10 +3,6 @@ name: helm-releases on: push: branches: [main] - # Ecluding path as they are specifig to building Share container image - paths-ignore: - - 'docker-files/Dockerfile-share' - - '.github/workflows/cloud-platform-build-push-share.yml' workflow_dispatch: permissions: diff --git a/alfresco-content-services/values.yaml b/alfresco-content-services/values.yaml index 445693b..919c7b1 100644 --- a/alfresco-content-services/values.yaml +++ b/alfresco-content-services/values.yaml @@ -558,7 +558,7 @@ share: image: # repository: quay.io/alfresco/alfresco-share repository: 754256621582.dkr.ecr.eu-west-2.amazonaws.com/hmpps-migration/alfresco-share - tag: 56302f65ffc961a372823ee79f390e6727c63b4b + tag: 9dac5c1560fd54a60879b95d707a5ccd515be990 pullPolicy: IfNotPresent internalPort: 8080 service: diff --git a/docker-files/Dockerfile-share b/docker-files/Dockerfile-share deleted file mode 100644 index 296b4aa..0000000 --- a/docker-files/Dockerfile-share +++ /dev/null @@ -1,16 +0,0 @@ -FROM quay.io/alfresco/alfresco-share:7.3.1 - -ARG TOMCAT_DIR=/usr/local/tomcat - -USER root - - # Restore permissions -RUN chgrp -R nobody ${TOMCAT_DIR}/webapps && \ - find ${TOMCAT_DIR}/webapps -type d -exec chmod 0777 {} \; && \ - find ${TOMCAT_DIR}/webapps -type f -exec chmod 0777 {} \; && \ - find ${TOMCAT_DIR}/shared -type d -exec chmod 0777 {} \; && \ - find ${TOMCAT_DIR}/shared -type f -exec chmod 0777 {} \; && \ - chmod -R g+r ${TOMCAT_DIR}/webapps && \ - chgrp -R nobody ${TOMCAT_DIR} - - USER nobody \ No newline at end of file diff --git a/docker-files/README.md b/docker-files/README.md deleted file mode 100644 index 36819cb..0000000 --- a/docker-files/README.md +++ /dev/null @@ -1,2 +0,0 @@ -This is an example how to create a container image for the `Share` component: -- `docker image build -f Dockerfile-share --tag /alfresco-share:7.3.1 .` \ No newline at end of file