From a0cdd22c3d24e3809f37e040fd1df134c65dd3c6 Mon Sep 17 00:00:00 2001 From: Ivan Gromakovskii Date: Mon, 3 May 2021 16:12:07 +0300 Subject: [PATCH 1/5] Set correct creation date of Docker images --- .buildkite/pipeline.yml | 6 ++++-- docker.nix | 5 ++++- flake.nix | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 28d63d19..62aebb31 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -66,9 +66,11 @@ steps: branches: "demo" - label: Push backend image to registry commands: - - nix-shell --run 'scripts/docker-push.sh docker-archive:$(nix-build -A packages.x86_64-linux.docker-backend) docker://ghcr.io/serokell/edna-backend:latest' + - CURRENT_DATE=$(date --iso-8601=seconds) + - nix-shell --run 'scripts/docker-push.sh docker-archive:$(nix-build -A packages.x86_64-linux.docker-backend --argstr creationDate "$CURRENT_DATE") docker://ghcr.io/serokell/edna-backend:latest' branches: "master" - label: Push frontend image to registry commands: - - nix-shell --run 'scripts/docker-push.sh docker-archive:$(nix-build -A packages.x86_64-linux.docker-frontend) docker://ghcr.io/serokell/edna-frontend:latest' + - CURRENT_DATE=$(date --iso-8601=seconds) + - nix-shell --run 'scripts/docker-push.sh docker-archive:$(nix-build -A packages.x86_64-linux.docker-frontend --argstr creationDate "$CURRENT_DATE") docker://ghcr.io/serokell/edna-frontend:latest' branches: "master" diff --git a/docker.nix b/docker.nix index 5652e607..44bf1f11 100644 --- a/docker.nix +++ b/docker.nix @@ -9,7 +9,8 @@ , glibcLocales , linkFarm , runCommand -, writeTextDir }: +, writeTextDir +, creationDate }: let inherit (dockerTools) buildLayeredImage buildImage pullImage; @@ -26,6 +27,7 @@ in in buildLayeredImage { name = "ghcr.io/serokell/edna-backend"; tag = "latest"; + created = creationDate; contents = [ backend @@ -78,6 +80,7 @@ in in buildImage { name = "ghcr.io/serokell/edna-frontend"; tag = "latest"; + created = creationDate; fromImage = nginx; contents = [ html diff --git a/flake.nix b/flake.nix index 8dfc0e8e..b4caf8ee 100644 --- a/flake.nix +++ b/flake.nix @@ -82,6 +82,7 @@ }; docker = pkgs.callPackage ./docker.nix { backend = backend.server; + inherit creationDate; inherit frontend; }; From 2e647b7ae1d760211d28476ca29f48e141b6c717 Mon Sep 17 00:00:00 2001 From: Ivan Gromakovskii Date: Tue, 4 May 2021 09:24:56 +0300 Subject: [PATCH 2/5] fixup! Set correct creation date of Docker images --- flake.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index b4caf8ee..567d2f89 100644 --- a/flake.nix +++ b/flake.nix @@ -82,7 +82,6 @@ }; docker = pkgs.callPackage ./docker.nix { backend = backend.server; - inherit creationDate; inherit frontend; }; @@ -100,8 +99,8 @@ analysis-env = analysis-env; backend-lib = backend.library; backend-server = backend.server; - docker-backend = docker.backend-image; - docker-frontend = docker.frontend-image; + docker-backend = { creationDate ? "1970-01-01T00:00:01Z" }: (docker creationDate).backend-image; + docker-frontend = { creationDate ? "1970-01-01T00:00:01Z" }: (docker creationDate).frontend-image; frontend = frontend; }; From cbf06b004ff83e42b0cbd8a9093c8c4c0aba6a91 Mon Sep 17 00:00:00 2001 From: Ivan Gromakovskii Date: Tue, 4 May 2021 09:28:16 +0300 Subject: [PATCH 3/5] fixup! Set correct creation date of Docker images --- flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 567d2f89..2b018bc5 100644 --- a/flake.nix +++ b/flake.nix @@ -80,9 +80,10 @@ inherit analysis-env; EDNA_ANALYSIS_DIR = ./analysis; }; - docker = pkgs.callPackage ./docker.nix { + docker = creationDate: pkgs.callPackage ./docker.nix { backend = backend.server; inherit frontend; + creationDate = creationDate; }; frontend = pkgs.callPackage ./frontend { }; From fdd9d440d9e8f456e540fe0f8ebb14606f3796e1 Mon Sep 17 00:00:00 2001 From: Ivan Gromakovskii Date: Tue, 4 May 2021 09:32:19 +0300 Subject: [PATCH 4/5] fixup! Set correct creation date of Docker images --- .buildkite/pipeline.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 62aebb31..9eb02248 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -2,6 +2,10 @@ # # SPDX-License-Identifier: AGPL-3.0-or-later +# Doesn't need to be precise +env: + CURRENT_DATE: $(date --iso-8601=seconds) + steps: # Checks for the whole repo - label: check trailing whitespace @@ -29,7 +33,7 @@ steps: - nix-build -A checks.x86_64-linux.backend-test - label: backend image commands: - - nix-build -A packages.x86_64-linux.docker-backend + - nix-build -A packages.x86_64-linux.docker-backend --argstr creationDate "$CURRENT_DATE" - buildkite-agent artifact upload "$(readlink -f result)" - label: backend hlint commands: @@ -41,7 +45,7 @@ steps: - nix-build -A packages.x86_64-linux.frontend - label: frontend image commands: - - nix-build -A packages.x86_64-linux.docker-frontend + - nix-build -A packages.x86_64-linux.docker-frontend --argstr creationDate "$CURRENT_DATE" - buildkite-agent artifact upload "$(readlink -f result)" - label: frontend tscompile commands: @@ -66,11 +70,9 @@ steps: branches: "demo" - label: Push backend image to registry commands: - - CURRENT_DATE=$(date --iso-8601=seconds) - nix-shell --run 'scripts/docker-push.sh docker-archive:$(nix-build -A packages.x86_64-linux.docker-backend --argstr creationDate "$CURRENT_DATE") docker://ghcr.io/serokell/edna-backend:latest' branches: "master" - label: Push frontend image to registry commands: - - CURRENT_DATE=$(date --iso-8601=seconds) - nix-shell --run 'scripts/docker-push.sh docker-archive:$(nix-build -A packages.x86_64-linux.docker-frontend --argstr creationDate "$CURRENT_DATE") docker://ghcr.io/serokell/edna-frontend:latest' branches: "master" From 800b19cbc62815f269606db2b0e9aa22b414d661 Mon Sep 17 00:00:00 2001 From: Ivan Gromakovskii Date: Tue, 4 May 2021 11:10:01 +0300 Subject: [PATCH 5/5] fixup! Set correct creation date of Docker images --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 2b018bc5..5f5d46b8 100644 --- a/flake.nix +++ b/flake.nix @@ -39,9 +39,9 @@ profile = with self.packages.${system}; linkFarm "edna-deploy-profile" [ { name = "backend.tar.gz"; - path = docker-backend; } + path = docker-backend { }; } { name = "frontend.tar.gz"; - path = docker-frontend; } + path = docker-frontend { }; } ]; in { hostname = "${hostName}.edna.serokell.team";