From d273724835b619481bda59ff2d828a5ff5118a90 Mon Sep 17 00:00:00 2001
From: Joep Meindertsma <joep@ontola.io>
Date: Fri, 3 Mar 2023 15:28:22 +0100
Subject: [PATCH] Fix CI docker #605

Disable provenance docker ci #605

Retry frovlad image

#605 rust docker base image buster

Remove platforms dokcer #605

Default rust build image

Try sparse registry

Nightly

Fix nightly

Net git fetch
---
 .github/workflows/docker.yml | 11 +++++------
 .github/workflows/main.yml   |  1 +
 dockerfile                   |  5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0c8131581..b67eb2752 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,4 +1,4 @@
-name: Build docker image
+name: Docker
 
 on:
   workflow_dispatch:
@@ -13,9 +13,7 @@ on:
 
 jobs:
   push_to_registry:
-    name: Push Docker image to Docker Hub
-    # See https://github.com/atomicdata-dev/atomic-data-rust/issues/499
-    # if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
+    name: Build Docker images and push to Docker Hub
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
@@ -43,10 +41,11 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: .
           push: true
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+          provenance: false
+          platforms: linux/amd64,linux/arm64
           tags: joepmeneer/atomic-server:latest
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b59467894..72a3f6859 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,5 +1,6 @@
 on: [push, workflow_dispatch]
 
+name: "Build, test, clippy"
 jobs:
   check:
     name: Check
diff --git a/dockerfile b/dockerfile
index 266ca381f..04b09db1b 100644
--- a/dockerfile
+++ b/dockerfile
@@ -1,11 +1,12 @@
-FROM rust as builder
+FROM rust:1.67 as builder
 WORKDIR /app
 COPY . .
-RUN cargo build --release --bin atomic-server
+RUN cargo build --release --bin atomic-server --config net.git-fetch-with-cli=true
 
 # We only need a small runtime for this step, but make sure glibc is installed
 FROM frolvlad/alpine-glibc:alpine-3.16_glibc-2.34 as runtime
 COPY --chmod=0755 --from=builder /app/target/release/atomic-server /atomic-server-bin
+# For a complete list of possible ENV vars or available flags, run with `--help`
 ENV ATOMIC_STORE_PATH="/atomic-storage/db"
 ENV ATOMIC_CONFIG_PATH="/atomic-storage/config.toml"
 ENV ATOMIC_PORT="80"