1.0.4 (#134)

* Fix changelog with 1.0.3 details. (#128) * Upgrade to AWS CLI v2. (#130) * Bump urllib3 from 2.0.5 to 2.0.6 (#131) Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.0.5 to 2.0.6. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](urllib3/urllib3@v2.0.5...2.0.6) --- updated-dependencies: - dependency-name: urllib3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add Docker image test workflow (#132) Adds a github actions workflow that builds and tests Docker images on pull requests and release branches. * Update push-test-image.yml (#133) Expand branch pattern * Update CHANGELOG.md --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
jvrck · Oct 10, 2023 · 633924a · 633924a
1 parent 430917b
commit 633924a
Show file tree

Hide file tree

Showing 5 changed files with 110 additions and 8 deletions.
diff --git a/.github/workflows/push-test-image.yml b/.github/workflows/push-test-image.yml
@@ -0,0 +1,78 @@
+name: Test Docker Image Workflow
+
+on:
+  pull_request:
+    branches:
+      - '*'
+  push:
+    branches:
+      - 'release-*'
+      - '*-release'
+      - 'release/*'
+
+jobs:
+  build-and-run-images:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@v4
+
+      - name: Build and Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64
+          file: ./Dockerfile
+          push: false
+          tags: |
+            ghcr.io/jvrck/bbripper:${{ github.run_id }}
+
+      - name: Run Docker image
+        run: |
+          docker run \
+            -e BB_USER=$BB_USER \
+            -e BB_WORKSPACE=$BB_WORKSPACE \
+            -e BB_PASSWORD=$BB_PASSWORD \
+            ghcr.io/jvrck/bbripper:${{ github.run_id }}
+        env:
+          BB_USER: ${{ secrets.BB_USER }}
+          BB_WORKSPACE: ${{ secrets.BB_WORKSPACE }}
+          BB_PASSWORD: ${{ secrets.BB_PASSWORD }}
+
+  build-and-run-aws-images:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@v4
+
+      - name: Build and Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64
+          file: ./Dockerfile
+          build-args: AWSCLI=TRUE
+          push: false
+          tags: |
+            ghcr.io/jvrck/bbripper:${{ github.run_id }}-aws
+
+      - name: Run Docker image
+        run: |
+          docker run \
+            -e BB_USER=$BB_USER \
+            -e BB_WORKSPACE=$BB_WORKSPACE \
+            -e BB_PASSWORD=$BB_PASSWORD \
+            ghcr.io/jvrck/bbripper:${{ github.run_id }}-aws
+        env:
+          BB_USER: ${{ secrets.BB_USER }}
+          BB_WORKSPACE: ${{ secrets.BB_WORKSPACE }}
+          BB_PASSWORD: ${{ secrets.BB_PASSWORD }}
+
+      - name: Run Docker image - Check AWS CLI
+        run: |
+          docker run \
+            ghcr.io/jvrck/bbripper:${{ github.run_id }}-aws aws --version
+        env:
+          BB_USER: ${{ secrets.BB_USER }}
+          BB_WORKSPACE: ${{ secrets.BB_WORKSPACE }}
+          BB_PASSWORD: ${{ secrets.BB_PASSWORD }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.4] - 2023-10-10
+
+### Added
+
+- Dependabot updates.
+- Docker container testing and workflow.
+- Changelog fix.
+
+## [1.0.3] - 2023-10-08
+
+### Added
+
+- Dependabot updates.
+- Documentation updates.
+
 ## [1.0.2] - 2023-07-29
 
 ### Added

diff --git a/Dockerfile b/Dockerfile
@@ -7,14 +7,12 @@ COPY requirements.txt /ripper
 COPY bb-ripper/ /ripper/
 COPY setup.sh /ripper
 
-RUN chmod +x setup.sh
-RUN /ripper/setup.sh
-RUN rm /ripper/setup.sh
 RUN apt-get update && apt-get upgrade -y && apt-get install -y git
-RUN  pip install -r requirements.txt
+RUN chmod +x setup.sh && ./setup.sh && rm setup.sh
+RUN pip install -r requirements.txt
 
 VOLUME /data
 
 ENV BB_RIPPER_EXPORT_DIRECTORY=/data/
 
-CMD python3 .
+CMD python3 .
diff --git a/requirements.txt b/requirements.txt
@@ -2,4 +2,4 @@ certifi==2023.7.22
 charset-normalizer==3.3.0
 idna==3.4
 requests==2.31.0
-urllib3==2.0.5
+urllib3==2.0.6
diff --git a/setup.sh b/setup.sh
@@ -3,7 +3,18 @@ set -ex
 
 # Install AWS CLI 
 if [ "$AWSCLI" == "TRUE" ] ; then 
-    pip3 install awscli ; 
+    # Required for AWS CLI download and unzip. Remove after installation.
+    apt-get install -y curl unzip ;
+
+    # Download and install AWS CLI. Clean up after installation.
+    curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" ;
+    unzip awscliv2.zip ;
+    ./aws/install ;
+    rm -rf aws ;
+    rm -rf awscliv2.zip ;
+
+    # Clean up after installation.  
+    apt-get -y --purge remove curl unzip ;
 else 
     echo Argument not provided ; 
-fi
+fi