From 7d768e9451bbd3b1e692be57c98100ba65898eef Mon Sep 17 00:00:00 2001 From: "filip.mihajlovski" Date: Wed, 20 Nov 2024 13:13:26 +0100 Subject: [PATCH 1/3] updates ckan version and adds xloader version control --- images/ckan/2.10/Dockerfile.xloader | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/images/ckan/2.10/Dockerfile.xloader b/images/ckan/2.10/Dockerfile.xloader index dda4512..64c16b1 100644 --- a/images/ckan/2.10/Dockerfile.xloader +++ b/images/ckan/2.10/Dockerfile.xloader @@ -4,11 +4,14 @@ FROM alpine:3.17.2 as ckanbuild # Used by Github Actions to tag the image with -ENV IMAGE_TAG=2.10.4-xloader +ENV IMAGE_TAG=2.10.5-xloader # Set CKAN version to build ENV GIT_URL=https://github.com/ckan/ckan.git -ENV GIT_BRANCH=ckan-2.10.4 +ENV GIT_BRANCH=ckan-2.10.5 + +ENV XLOADER_URL=https://github.com/ckan/ckanext-xloader +ENV XLOADER_VERSION=1.1.2 # Set src dirs ENV SRC_DIR=/srv/app/src @@ -132,7 +135,7 @@ RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \ python ${SRC_DIR}/get-pip.py ### XLoader ### -RUN pip3 install -e 'git+https://github.com/keitaroinc/ckanext-xloader.git@master#egg=ckanext-xloader' && \ +RUN pip3 install -e 'git+${XLOADER_URL}.git@${XLOADER_VERSION}#egg=ckanext-xloader' && \ pip3 install -r ${SRC_DIR}/ckanext-xloader/requirements.txt && \ pip3 install -U requests[security] From 4d1e14141559cf960e2cd67f2f40047715565305 Mon Sep 17 00:00:00 2001 From: "filip.mihajlovski" Date: Wed, 20 Nov 2024 14:19:25 +0100 Subject: [PATCH 2/3] fixes bugged package --- images/ckan/2.10/Dockerfile.xloader | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/images/ckan/2.10/Dockerfile.xloader b/images/ckan/2.10/Dockerfile.xloader index 64c16b1..995a78e 100644 --- a/images/ckan/2.10/Dockerfile.xloader +++ b/images/ckan/2.10/Dockerfile.xloader @@ -10,9 +10,6 @@ ENV IMAGE_TAG=2.10.5-xloader ENV GIT_URL=https://github.com/ckan/ckan.git ENV GIT_BRANCH=ckan-2.10.5 -ENV XLOADER_URL=https://github.com/ckan/ckanext-xloader -ENV XLOADER_VERSION=1.1.2 - # Set src dirs ENV SRC_DIR=/srv/app/src ENV PIP_SRC=${SRC_DIR} @@ -103,6 +100,11 @@ FROM alpine:3.17.2 LABEL maintainer="Keitaro Inc " LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan +# Xloader version control + +ENV XLOADER_URL=https://github.com/ckan/ckanext-xloader.git +ENV XLOADER_VERSION=1.1.2 + ENV APP_DIR=/srv/app ENV SRC_DIR=/srv/app/src ENV CKAN_DIR=${SRC_DIR}/ckan @@ -134,10 +136,10 @@ RUN apk add --no-cache \ RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \ python ${SRC_DIR}/get-pip.py - ### XLoader ### -RUN pip3 install -e 'git+${XLOADER_URL}.git@${XLOADER_VERSION}#egg=ckanext-xloader' && \ - pip3 install -r ${SRC_DIR}/ckanext-xloader/requirements.txt && \ - pip3 install -U requests[security] +### XLoader ### +RUN pip3 install -e git+${XLOADER_URL}@${XLOADER_VERSION}#egg=ckanext-xloader && \ + pip3 install -r ${SRC_DIR}/ckanext-xloader/requirements.txt && \ + pip3 install -U requests[security] # Get artifacts from build stages COPY --from=ckanbuild /wheels /srv/app/wheels @@ -153,6 +155,8 @@ RUN addgroup -g 92 -S ckan && \ WORKDIR ${CKAN_DIR} +#Removes bugged package +RUN rm -rf /usr/lib/python3.10/site-packages/packaging* # Install CKAN RUN pip install -e /srv/app/src/ckan && \ cp who.ini ${APP_DIR} && \ From fc2017d4ee8e74888d393d3a06914b7216e87a6b Mon Sep 17 00:00:00 2001 From: stojanovskis1 Date: Wed, 27 Nov 2024 12:46:46 +0100 Subject: [PATCH 3/3] Remove ckan 2.7 and 2.8 from build pipeline --- .github/workflows/master_merge.yml | 130 ----------------------------- .github/workflows/pr_checks.yml | 96 --------------------- 2 files changed, 226 deletions(-) diff --git a/.github/workflows/master_merge.yml b/.github/workflows/master_merge.yml index 251883a..2b53c90 100644 --- a/.github/workflows/master_merge.yml +++ b/.github/workflows/master_merge.yml @@ -219,136 +219,6 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache-ubuntu-2-9 cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-ubuntu-2-9 - build-ckan-2-8: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.CR_PAT }} - - - name: Cache Docker layers - uses: actions/cache@v4 - with: - path: | - /tmp/.buildx-cache-alpine-2-8 - /tmp/.buildx-cache-ubuntu-2-8 - key: ${{ runner.os }}-buildx-2-8-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx-2-8 - - - name: Get docker tag for Alpine image - id: alpine - run: | - echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.8/Dockerfile)" >> $GITHUB_OUTPUT - - - name: Build and push CKAN 2.8 alpine - uses: docker/build-push-action@v5 - with: - context: ./images/ckan/2.8 - file: ./images/ckan/2.8/Dockerfile - push: true - tags: | - keitaro/ckan:${{ steps.alpine.outputs.IMAGE_TAG }} - ghcr.io/keitaroinc/ckan:${{ steps.alpine.outputs.IMAGE_TAG }} - cache-from: type=local,src=/tmp/.buildx-cache-alpine-2-8 - cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-alpine-2-8 - - - name: Get docker tag for Ubuntu image - id: ubuntu - run: | - echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.8/Dockerfile.focal)" >> $GITHUB_OUTPUT - - - name: Build and push CKAN 2.8 ubuntu - uses: docker/build-push-action@v5 - with: - context: ./images/ckan/2.8 - file: ./images/ckan/2.8/Dockerfile.focal - push: true - tags: | - keitaro/ckan:${{ steps.ubuntu.outputs.IMAGE_TAG }} - ghcr.io/keitaroinc/ckan:${{ steps.ubuntu.outputs.IMAGE_TAG }} - cache-from: type=local,src=/tmp/.buildx-cache-ubuntu-2-8 - cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-ubuntu-2-8 - - build-ckan-2-7: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.CR_PAT }} - - - name: Cache Docker layers - uses: actions/cache@v4 - with: - path: | - /tmp/.buildx-cache-alpine-2-7 - /tmp/.buildx-cache-ubuntu-2-7 - key: ${{ runner.os }}-buildx-2-7-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx-2-7 - - - name: Get docker tag for Alpine image - id: alpine - run: | - echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.7/Dockerfile)" >> $GITHUB_OUTPUT - - - name: Build and push CKAN 2.7 alpine - uses: docker/build-push-action@v5 - with: - context: ./images/ckan/2.7 - file: ./images/ckan/2.7/Dockerfile - push: true - tags: | - keitaro/ckan:${{ steps.alpine.outputs.IMAGE_TAG }} - ghcr.io/keitaroinc/ckan:${{ steps.alpine.outputs.IMAGE_TAG }} - cache-from: type=local,src=/tmp/.buildx-cache-alpine-2-7 - cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-alpine-2-7 - - - name: Get docker tag for Ubuntu image - id: ubuntu - run: | - echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.7/Dockerfile.focal)" >> $GITHUB_OUTPUT - - - name: Build CKAN 2.7 ubuntu - uses: docker/build-push-action@v5 - with: - context: ./images/ckan/2.7 - file: ./images/ckan/2.7/Dockerfile.focal - push: true - tags: | - keitaro/ckan:${{ steps.ubuntu.outputs.IMAGE_TAG }} - ghcr.io/keitaroinc/ckan:${{ steps.ubuntu.outputs.IMAGE_TAG }} - cache-from: type=local,src=/tmp/.buildx-cache-ubuntu-2-7 - cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-ubuntu-2-7 - build-ckan-datapusher: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml index 87d47e3..350e4bb 100644 --- a/.github/workflows/pr_checks.yml +++ b/.github/workflows/pr_checks.yml @@ -173,102 +173,6 @@ jobs: build-args: | --progress=plain - build-ckan-2-8: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Cache Docker layers - uses: actions/cache@v4 - with: - path: | - /tmp/.buildx-cache-alpine-2-8 - /tmp/.buildx-cache-ubuntu-2-8 - key: ${{ runner.os }}-buildx-2-8-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx-2-8 - - - name: Get docker tag for Alpine image - id: alpine - run: | - echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.8/Dockerfile)" >> $GITHUB_OUTPUT - - - name: Build CKAN 2.8 alpine - uses: docker/build-push-action@v5 - with: - context: ./images/ckan/2.8 - file: ./images/ckan/2.8/Dockerfile - push: false - tags: keitaro/ckan:${{ steps.alpine.outputs.IMAGE_TAG }} - cache-from: type=local,src=/tmp/.buildx-cache-alpine-2-8 - cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-alpine-2-8 - - - name: Get docker tag for Ubuntu image - id: ubuntu - run: | - echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.8/Dockerfile.focal)" >> $GITHUB_OUTPUT - - - name: Build CKAN 2.8 ubuntu - uses: docker/build-push-action@v5 - with: - context: ./images/ckan/2.8 - file: ./images/ckan/2.8/Dockerfile.focal - push: false - tags: keitaro/ckan:${{ steps.ubuntu.outputs.IMAGE_TAG }} - cache-from: type=local,src=/tmp/.buildx-cache-ubuntu-2-8 - cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-ubuntu-2-8 - - build-ckan-2-7: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Cache Docker layers - uses: actions/cache@v4 - with: - path: | - /tmp/.buildx-cache-alpine-2-7 - /tmp/.buildx-cache-ubuntu-2-7 - key: ${{ runner.os }}-buildx-2-7-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-buildx-2-7 - - - name: Get docker tag for Alpine image - id: alpine - run: | - echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.7/Dockerfile)" >> $GITHUB_OUTPUT - - - name: Build CKAN 2.7 alpine - uses: docker/build-push-action@v5 - with: - context: ./images/ckan/2.7 - file: ./images/ckan/2.7/Dockerfile - push: false - tags: keitaro/ckan:${{ steps.alpine.outputs.IMAGE_TAG }} - cache-from: type=local,src=/tmp/.buildx-cache-alpine-2-7 - cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-alpine-2-7 - - - name: Get docker tag for Ubuntu image - id: ubuntu - run: | - echo "IMAGE_TAG=$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.7/Dockerfile.focal)" >> $GITHUB_OUTPUT - - - name: Build CKAN 2.7 ubuntu - uses: docker/build-push-action@v5 - with: - context: ./images/ckan/2.7 - file: ./images/ckan/2.7/Dockerfile.focal - push: false - tags: keitaro/ckan:${{ steps.ubuntu.outputs.IMAGE_TAG }} - cache-from: type=local,src=/tmp/.buildx-cache-ubuntu-2-7 - cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-ubuntu-2-7 - build-ckan-datapusher: runs-on: ubuntu-latest steps: