From 3cd7247b59e4f7623054457e3756db64e169c5e1 Mon Sep 17 00:00:00 2001 From: Tod Hansmann Date: Mon, 5 Aug 2024 14:29:49 -0600 Subject: [PATCH 1/3] fix: publish first catalyst community version --- .github/workflows/release.yaml | 6 +++--- Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c3be127..be7d8b0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -17,7 +17,7 @@ jobs: new_release_version: "${{ steps.release.outputs.new_release_version }}" steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: token: ${{ secrets.AUTOMATION_PAT }} fetch-depth: 0 @@ -27,8 +27,8 @@ jobs: # install: true - - name: setup git config run: | - git config --global user.name "Catalyst Squad Automation" - git config --global user.email "" + git config --global user.name "Catalyst Community Automation" + git config --global user.email "" - name: Get semver-tags run: | wget -c https://github.com/catalystcommunity/semver-tags/releases/download/v0.3.2/semver-tags.tar.gz -O - | tar -xz diff --git a/Dockerfile b/Dockerfile index ca0dabd..e32d67e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:latest -LABEL maintainer="Catalyst Squad " +LABEL maintainer="Catalyst Community " WORKDIR /workspace ARG TARGETPLATFORM=amd64 From ea084faf413f9f2cacc730a1836db0886048d089 Mon Sep 17 00:00:00 2001 From: Tod Hansmann Date: Mon, 5 Aug 2024 14:33:34 -0600 Subject: [PATCH 2/3] fix: use new netcat package name --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e32d67e..5a04722 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN apt update -y \ jq \ libunwind8 \ locales \ - netcat \ + netcat-traditional \ openssh-client \ parallel \ postgresql-client \ From 62205f5a7e21a07d13d23de4470fcc26aa16752b Mon Sep 17 00:00:00 2001 From: Tod Hansmann Date: Mon, 5 Aug 2024 15:23:04 -0600 Subject: [PATCH 3/3] fix: install correct dependencies for latest ubuntu image --- Dockerfile | 20 +++++++++++++------- scripts/install_dotnet.sh | 0 scripts/install_terraform.sh | 0 3 files changed, 13 insertions(+), 7 deletions(-) mode change 100644 => 100755 scripts/install_dotnet.sh mode change 100644 => 100755 scripts/install_terraform.sh diff --git a/Dockerfile b/Dockerfile index 5a04722..0a059af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,7 @@ RUN apt update -y \ iputils-ping \ jq \ libunwind8 \ + libyaml-dev \ locales \ netcat-traditional \ openssh-client \ @@ -55,10 +56,10 @@ RUN apt update -y \ && ln -sf /usr/bin/pip3 /usr/bin/pip \ && rm -rf /var/lib/apt/lists/* -RUN pip3 install --upgrade pip -RUN pip3 install setuptools watchdog poetry yq yamllint +#RUN pip3 install --upgrade --break-system-packages pip +RUN pip3 install --break-system-packages setuptools watchdog poetry yq yamllint -# Get all the node tooling in with 16.x +# Get all the node tooling in with 18.x RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - RUN apt-get install -y nodejs @@ -72,7 +73,6 @@ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s # Any custom utilities can be brought over from here and access via the scripts directory COPY ./scripts ./scripts -RUN chmod +x ./scripts/* # Install Dotnet 8 SDK RUN ./scripts/install_dotnet.sh @@ -110,7 +110,7 @@ RUN set -vx; \ && tar zxvf docker.tgz \ && install -o root -g root -m 755 docker/docker /usr/local/bin/docker \ && rm -rf docker docker.tgz \ - && adduser --disabled-password --gecos "" --uid 1000 runner \ + && adduser --disabled-password --gecos "" --uid 1001 runner \ && groupadd docker \ && usermod -aG sudo runner \ && usermod -aG docker runner \ @@ -121,6 +121,8 @@ ENV HOME=/workspace COPY scripts/install_actions.sh /actions-runner/ +# This line is normally used to get the install dependencies from myoung34's repo, but we install them manually beforehand, so it is replaced with a no-op +# && sed -i.bak 's/.\/bin\/installdependencies.sh/wget https:\/\/raw.githubusercontent.com\/myoung34\/runner\/main\/src\/Misc\/layoutbin\/installdependencies.sh -O .\/bin\/installdependencies.sh; bash .\/bin\/installdependencies.sh/g' /actions-runner/install_actions.sh \ ENV RUNNER_ASSETS_DIR=/runnertmp RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \ && if [ "$ARCH" = "amd64" ] || [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "i386" ]; then export ARCH=x64 ; fi \ @@ -128,14 +130,18 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \ && cd "$RUNNER_ASSETS_DIR" \ # Comment-out the below curl invocation when you use your own build of actions/runner && curl -f -L -o runner.tar.gz https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-linux-${ARCH}-${RUNNER_VERSION}.tar.gz \ + && ls -al ./ \ && tar xzf ./runner.tar.gz \ && rm runner.tar.gz \ && chmod +x /actions-runner/install_actions.sh \ - && sed -i.bak 's/.\/bin\/installdependencies.sh/wget https:\/\/raw.githubusercontent.com\/myoung34\/runner\/main\/src\/Misc\/layoutbin\/installdependencies.sh -O .\/bin\/installdependencies.sh; bash .\/bin\/installdependencies.sh/g' /actions-runner/install_actions.sh \ + && apt-get install -y --no-install-recommends \ + liblttng-ust1t64 \ + libkrb5-3 \ + zlib1g \ + && sed -i.bak 's/.\/bin\/installdependencies.sh/echo "Dependencies are installed in external command previously"/g' /actions-runner/install_actions.sh \ && /actions-runner/install_actions.sh ${RUNNER_VERSION} ${TARGETPLATFORM} \ && rm /actions-runner/install_actions.sh \ && mv ./externals ./externalstmp \ - && apt-get install -y libyaml-dev \ && rm -rf /var/lib/apt/lists/* ENV RUNNER_TOOL_CACHE=/opt/hostedtoolcache diff --git a/scripts/install_dotnet.sh b/scripts/install_dotnet.sh old mode 100644 new mode 100755 diff --git a/scripts/install_terraform.sh b/scripts/install_terraform.sh old mode 100644 new mode 100755