GitHub Actions Upgrade and Dockerfile improvements

matamorphosis · Jan 19, 2023 · 667b823 · 667b823
1 parent b0690a2
commit 667b823
Show file tree

Hide file tree

Showing 6 changed files with 33,152 additions and 6 deletions.
diff --git a/.github/workflows/codeql_analysis.yml b/.github/workflows/codeql_analysis.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1

diff --git a/.github/workflows/ossar-analysis.yml b/.github/workflows/ossar-analysis.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Ensure a compatible version of dotnet is installed.
     # The [Microsoft Security Code Analysis CLI](https://aka.ms/mscadocs) is built with dotnet v3.1.201.

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Build the Scrummage Docker image
       run: |

diff --git a/Dockerfile b/Dockerfile
@@ -22,8 +22,6 @@ ENV PATH="$POETRY_HOME/bin:$PATH"
 #----------------------------------------------------------------------------------------------------
 ENV TZ=Australia/Sydney
 RUN apt install -y tzdata python3.9 python3.9-distutils python3-psycopg2 postgresql postgresql-contrib build-essential wget unzip git openssl curl sudo fonts-font-awesome
-RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
-RUN python3.9 get-pip.py
 RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
 RUN apt install -y ./google-chrome-stable_current_amd64.deb
 #----------------------------------------------------------------------------------------------------
@@ -76,7 +74,8 @@ RUN ./GetChromeDriver.sh
 # Install poetry packages
 #----------------------------------------------------------------------------------------------------
 WORKDIR /Scrummage
-RUN curl -sSL https://install.python-poetry.org/ | python3.9 -
+RUN python3.9 /Scrummage/installation/support_files/get-pip.py
+RUN python3.9 /Scrummage/installation/support_files/poetry-install.py
 RUN poetry self update
 RUN poetry install
 #----------------------------------------------------------------------------------------------------