Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: publish first catalyst community version #26

Merged
merged 3 commits into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 "<engineering@catalystsquad.com>"
git config --global user.name "Catalyst Community Automation"
git config --global user.email "<catalyst-community@todandlorna.com>"
- 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
Expand Down
24 changes: 15 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM ubuntu:latest
LABEL maintainer="Catalyst Squad <community@catalystsquad.com>"
LABEL maintainer="Catalyst Community <catalyst-community@todandlorna.com>"

WORKDIR /workspace
ARG TARGETPLATFORM=amd64
Expand Down Expand Up @@ -30,8 +30,9 @@ RUN apt update -y \
iputils-ping \
jq \
libunwind8 \
libyaml-dev \
locales \
netcat \
netcat-traditional \
openssh-client \
parallel \
postgresql-client \
Expand All @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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 \
Expand All @@ -121,21 +121,27 @@ 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 \
&& mkdir -p "$RUNNER_ASSETS_DIR" \
&& 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
Expand Down
Empty file modified scripts/install_dotnet.sh
100644 → 100755
Empty file.
Empty file modified scripts/install_terraform.sh
100644 → 100755
Empty file.
Loading