diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09ac872..3bf2a09 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: # This workflow contains a single job called "build" build: # The type of runner that the job will run on - runs-on: [ubuntu-24.10-s390x, ubuntu-22.10-ppc64le] + runs-on: [ubuntu-24.10-s390x, ubuntu-22.04-ppc64le] # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 8a6bbd5..30c45ba 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,15 +1,14 @@ -FROM ubuntu:24.10 +FROM ubuntu:22.04 ARG RUNNERREPO="https://github.com/actions/runner" RUNNERPATCH SDK_VERSION ARCH ENV DEBIAN_FRONTEND=noninteractive RUN apt-get -qq update -y && \ - apt-get -qq -y install wget git sudo alien curl dotnet-sdk-8.0 && \ + apt-get -qq -y install wget git sudo alien curl && \ apt autoclean -RUN dpkg --install /tmp/*.deb && \ - rm -rf /tmp/*.deb && \ +RUN apt-get -qq -y install dotnet-sdk-8.0 && \ SDK_VERSION=`dotnet --version` && \ echo "Using SDK - ${SDK_VERSION}" diff --git a/build-files/install-packages.sh b/build-files/install-packages.sh index e2a80fc..0f923e7 100644 --- a/build-files/install-packages.sh +++ b/build-files/install-packages.sh @@ -1,11 +1,16 @@ #!/bin/bash header() { - echo "+--------------------------------------------+" - echo "| $*" - echo "+--------------------------------------------+" + TS=`date +"%Y-%m-%dT%H:%M:%S%:z"` + echo "${TS} +--------------------------------------------+" + echo "${TS} | $*" + echo "${TS} +--------------------------------------------+" echo } +msg() { + echo `date +"%Y-%m-%dT%H:%M:%S%:z"` $* +} + # Check if the file name is provided if [ -z "$1" ]; then echo "Usage: $0 " @@ -21,7 +26,7 @@ if [ ! -f "$PACKAGE_LIST_FILE" ]; then fi header "Installing additional packages" # Update the package list -echo "Updating package list..." +msg "Updating package list..." sudo DEBIAN_FRONTEND=noninteractive apt-get -qq update -y # installing docker @@ -52,4 +57,4 @@ while IFS= read -r package || [ -n "$package" ]; do fi done < "$PACKAGE_LIST_FILE" -echo "All packages from $PACKAGE_LIST_FILE have been installed." +msg "All packages from $PACKAGE_LIST_FILE have been installed."