docker build-with-cache action

callmecampos · callmecampos · commit 7eccd3fface4 · 2020-07-20T09:45:18.000-07:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,12 +6,12 @@ env:
   CACHE_IMAGE: fmrcampos/docker-ci-cache
   GPR_CACHE_IMAGE: docker.pkg.github.com/${{ github.repository }}/docker-ci-cache
   CACHE_SEED: 1
+  DOCKER_BUILDKIT: 1
   NODE_VERSION: 14.4.0
 
 jobs:
   test:
     runs-on: ubuntu-latest
-    container: fmrcampos/docker-ci-cache:stage
     services:
       postgres:
         image: postgres:10.1
@@ -20,14 +20,28 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
+        ports:
+          # Maps tcp port 5432 on service container to the host
+          - 5432:5432
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
 
+      - uses: whoan/docker-build-with-cache-action@master
+        with:
+          image_name: ${{ env.CACHE_IMAGE }}
+          image_tag: stage
+          build_extra_args: "--cache-from ${{ env.CACHE_IMAGE }}:static --cache-from ${{ env.CACHE_IMAGE }}:build --cache-from ${{ env.CACHE_IMAGE }}:stage --build-arg BUILDKIT_INLINE_CACHE=1"
+          push_image_and_stages: false
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+
       - name: Cache pip dependencies
         uses: actions/cache@v2
         env:
-          cache-name: cache-pip-deps-dh
+          cache-name: cache-pip-deps-warehouse
         with:
           path: ./.cache/pip
           key: ${{ runner.os }}-${{ env.CACHE_SEED }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('requirements.txt') }}
@@ -68,24 +82,15 @@ jobs:
             ${{ runner.os }}-
 
       - name: Install dependencies
-        run: |
-          apt-get update && apt-get -y install make locales build-essential curl libpq-dev autoconf
-          apt -y install libcurl4-openssl-dev libssl-dev pkg-config
-
-      - name: Set locale
-        run: |
-          echo "LC_ALL=en_US.UTF-8" >> /etc/environment
-          echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
-          echo "LANG=en_US.UTF-8" > /etc/locale.conf
-          locale-gen en_US.UTF-8
+        run: sudo apt -y install libcurl4-openssl-dev libssl-dev pkg-config
 
       - name: Install pip requirements
         run: |
           mkdir ./.cache && mkdir ./.cache/pip
           chown -R $(whoami) ./.cache/pip
           pip install -U pip setuptools wheel --cache-dir ./.cache/pip
-          pip install -r requirements.txt --cache-dir ./.cache/pip
-          pip install -r requirements/dev.txt --cache-dir ./.cache/pip
+          pip install -r requirements/main.txt --cache-dir ./.cache/pip
+          pip install -r requirements/deploy.txt --cache-dir ./.cache/pip
           
       - name: Setup node
         run: |
@@ -100,105 +105,146 @@ jobs:
 
       - name: Run tests
         run: |
-          python -m coverage run -m pytest --strict --postgresql-host postgres
+          python -m coverage run -m pytest --strict --postgresql-host localhost
           python -m coverage html
           python -m coverage report -m --fail-under 100
         env:
           # The hostname used to communicate with the PostgreSQL service container
-          POSTGRES_HOST: postgres
+          POSTGRES_HOST: localhost
           # The default PostgreSQL port
           POSTGRES_PORT: 5432
 
   lint:
     runs-on: ubuntu-latest
-    container: fmrcampos/docker-ci-cache:stage
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
 
+      - uses: whoan/docker-build-with-cache-action@master
+        with:
+          image_name: ${{ env.CACHE_IMAGE }}
+          image_tag: stage
+          build_extra_args: "--cache-from ${{ env.CACHE_IMAGE }}:static --cache-from ${{ env.CACHE_IMAGE }}:build --cache-from ${{ env.CACHE_IMAGE }}:stage --build-arg BUILDKIT_INLINE_CACHE=1"
+          push_image_and_stages: false
+
       - uses: actions/setup-python@v2
         with:
           python-version: 3.8
 
       - name: Lint
         run: |
-          apt-get update && apt-get install make
+          sudo apt-get update && sudo apt-get install make
           make lint ACTIONS=true
 
   docs:
     runs-on: ubuntu-latest
-    container: fmrcampos/docker-ci-cache:stage
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
 
+      - uses: whoan/docker-build-with-cache-action@master
+        with:
+          image_name: ${{ env.CACHE_IMAGE }}
+          image_tag: stage
+          build_extra_args: "--cache-from ${{ env.CACHE_IMAGE }}:static --cache-from ${{ env.CACHE_IMAGE }}:build --cache-from ${{ env.CACHE_IMAGE }}:stage --build-arg BUILDKIT_INLINE_CACHE=1"
+          push_image_and_stages: false
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+
       - name: Documentation
         run: |
-          apt-get update && apt-get install make
+          sudo apt-get update && sudo apt-get install make
           make docs
   
   deps:
     runs-on: ubuntu-latest
-    container: fmrcampos/docker-ci-cache:stage
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
 
+      - uses: whoan/docker-build-with-cache-action@master
+        with:
+          image_name: ${{ env.CACHE_IMAGE }}
+          image_tag: stage
+          build_extra_args: "--cache-from ${{ env.CACHE_IMAGE }}:static --cache-from ${{ env.CACHE_IMAGE }}:build --cache-from ${{ env.CACHE_IMAGE }}:stage --build-arg BUILDKIT_INLINE_CACHE=1"
+          push_image_and_stages: false
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+
       - name: Cache pip dependencies
         uses: actions/cache@v2
         env:
-          cache-name: cache-pip-deps-dh
+          cache-name: cache-pip-deps-warehouse
         with:
-          path: ./.cache/pip
+          path: ~/.cache/pip
           key: ${{ runner.os }}-${{ env.CACHE_SEED }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('requirements.txt') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.CACHE_SEED }}-${{ github.job }}-${{ env.cache-name }}-
             ${{ runner.os }}-${{ env.CACHE_SEED }}-${{ github.job }}-
             ${{ runner.os }}-${{ env.CACHE_SEED }}-
             ${{ runner.os }}-
 
-      - name: Install dependencies
+      - name: Set cache permissions
         run: |
-          apt-get update && apt-get -y install build-essential make libpq-dev
-          apt -y install libcurl4-openssl-dev libssl-dev pkg-config
-          mkdir ./.cache && mkdir ./.cache/pip
-          chown -R $(whoami) ./.cache/pip
-          pip install -U pip setuptools wheel --cache-dir ./.cache/pip
-          pip install -r requirements.txt --cache-dir ./.cache/pip
-          pip install -r requirements/dev.txt --cache-dir ./.cache/pip
+          mkdir ~/.cache && mkdir ~/.cache/pip
+          chown -R $(whoami) ~/.cache/pip
 
       - name: Check dependencies
         run: make deps
 
   licenses:
     runs-on: ubuntu-latest
-    container: fmrcampos/docker-ci-cache:stage
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
 
+      - uses: whoan/docker-build-with-cache-action@master
+        with:
+          image_name: ${{ env.CACHE_IMAGE }}
+          image_tag: stage
+          build_extra_args: "--cache-from ${{ env.CACHE_IMAGE }}:static --cache-from ${{ env.CACHE_IMAGE }}:build --cache-from ${{ env.CACHE_IMAGE }}:stage --build-arg BUILDKIT_INLINE_CACHE=1"
+          push_image_and_stages: false
+
       - name: Check licenses
         run: bin/licenses
   
   translations:
     runs-on: ubuntu-latest
-    container: fmrcampos/docker-ci-cache:stage
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
 
+      - uses: whoan/docker-build-with-cache-action@master
+        with:
+          image_name: ${{ env.CACHE_IMAGE }}
+          image_tag: stage
+          build_extra_args: "--cache-from ${{ env.CACHE_IMAGE }}:static --cache-from ${{ env.CACHE_IMAGE }}:build --cache-from ${{ env.CACHE_IMAGE }}:stage --build-arg BUILDKIT_INLINE_CACHE=1"
+          push_image_and_stages: false
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+
       - name: Check translations
-        run: |
-          apt-get update && apt-get -y install make
-          make translations
+        run: make translations
 
   static-lint:
     runs-on: ubuntu-latest
-    container: fmrcampos/docker-ci-cache:static
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
 
+      - uses: whoan/docker-build-with-cache-action@master
+        with:
+          image_name: ${{ env.CACHE_IMAGE }}
+          image_tag: static
+          build_extra_args: "--target static --cache-from ${{ env.CACHE_IMAGE }}:static --build-arg BUILDKIT_INLINE_CACHE=1"
+          push_image_and_stages: false
+
       - name: Static Lint Check
         run: |
           npm install eslint --save-dev
@@ -207,11 +253,17 @@ jobs:
 
   static-tests:
     runs-on: ubuntu-latest
-    container: fmrcampos/docker-ci-cache:static
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
 
+      - uses: whoan/docker-build-with-cache-action@master
+        with:
+          image_name: ${{ env.CACHE_IMAGE }}
+          image_tag: static
+          build_extra_args: "--target static --cache-from ${{ env.CACHE_IMAGE }}:static --build-arg BUILDKIT_INLINE_CACHE=1"
+          push_image_and_stages: false
+
       - name: Cache node modules
         uses: actions/cache@v2
         env:
@@ -228,25 +280,25 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
-      - name: Locale & Dependency Setup
-        run: |
-          apt-get update && apt-get -y install locales
-          echo "LC_ALL=en_US.UTF-8" >> /etc/environment
-          echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
-          echo "LANG=en_US.UTF-8" > /etc/locale.conf
-          locale-gen en_US.UTF-8
-          npm install -D babel
+      - name: Dependency Setup
+        run: npm install -D babel
 
       - name: Static Tests
         run: bin/static_tests
 
   static-pipeline:
     runs-on: ubuntu-latest
-    container: fmrcampos/docker-ci-cache:static
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
 
+      - uses: whoan/docker-build-with-cache-action@master
+        with:
+          image_name: ${{ env.CACHE_IMAGE }}
+          image_tag: static
+          build_extra_args: "--target static --cache-from ${{ env.CACHE_IMAGE }}:static --build-arg BUILDKIT_INLINE_CACHE=1"
+          push_image_and_stages: false
+
       - name: Cache node version manager
         uses: actions/cache@v2
         env:
@@ -277,14 +329,8 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
-      - name: Locale & Dependency Setup
-        run: |
-          apt-get update && apt-get -y install locales
-          echo "LC_ALL=en_US.UTF-8" >> /etc/environment
-          echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
-          echo "LANG=en_US.UTF-8" > /etc/locale.conf
-          locale-gen en_US.UTF-8
-          npm install -D babel
+      - name: Dependency Setup
+        run: npm install -D babel
 
       - name: Static Pipeline Check
         run: bin/static_pipeline
diff --git a/.github/workflows/registry.yml b/.github/workflows/registry.yml
@@ -3,14 +3,14 @@ name: Registry Image Caching
 on:
   push:
     branches:
-      - master
+      - github-actions-ci
 
 env:
   CACHE_IMAGE: fmrcampos/docker-ci-cache
   GPR_CACHE_IMAGE: docker.pkg.github.com/${{ github.repository }}/docker-ci-cache
   DOCKER_BUILDKIT: 1
 
-update-cache:
+jobs:
   build-dh:
     name: Docker Hub Cache
     runs-on: ubuntu-latest
@@ -71,7 +71,6 @@ update-cache:
             --cache-from $GPR_CACHE_IMAGE:static \
             --tag $GPR_CACHE_IMAGE:static \
             --file ./Dockerfile \
-            # can't use BuildKit for GPR
             "."
       - name: Build build image from Dockerfile
         run: |
@@ -82,7 +81,6 @@ update-cache:
             --cache-from $GPR_CACHE_IMAGE:build \
             --tag $GPR_CACHE_IMAGE:build \
             --file ./Dockerfile \
-            # can't use BuildKit for GPR
             "."
       - name: Build stage image from Dockerfile
         run: |
@@ -92,7 +90,6 @@ update-cache:
             --cache-from $GPR_CACHE_IMAGE:stage \
             --tag $GPR_CACHE_IMAGE:stage \
             --file ./Dockerfile \
-            # can't use BuildKit for GPR
             "."
       - name: Push static image to package registry
         run: docker push $GPR_CACHE_IMAGE:static
diff --git a/Dockerfile b/Dockerfile
@@ -35,7 +35,6 @@ RUN set -x \
 COPY warehouse/static/ /opt/warehouse/src/warehouse/static/
 COPY warehouse/admin/static/ /opt/warehouse/src/warehouse/admin/static/
 COPY Gulpfile.babel.js /opt/warehouse/src/
-COPY tests/frontend .sass-lint.yml /opt/warehouse/src/
 
 RUN gulp dist
 
