-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #460 from IntersectMBO/test
staging: #351, #350, #320, #223, #317, #385, #358, #359, #151, #358, #360, #110, #379, #382, #361, #362, #446, #188, #377, #432, #364, #451, #433
- Loading branch information
1 parent
d960a99
commit fa67064
Showing
132 changed files
with
4,778 additions
and
7,137 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| common_mk := ../../scripts/govtool/common.mk | ||
| ifeq ($(origin $(common_mk)), undefined) | ||
| $(eval $(common_mk) := included) | ||
| include $(common_mk) | ||
| endif | ||
|
|
||
| .DEFAULT_GOAL := push-backend | ||
|
|
||
| # image tags | ||
| base_backend_image_tag := $(shell git hash-object $(root_dir)/govtool/backend/vva-be.cabal) | ||
| backend_image_tag := $(shell git log -n 1 --format="%H" -- $(root_dir)/govtool/backend) | ||
|
|
||
| .PHONY: build-backend-base | ||
| build-backend-base: docker-login | ||
| $(call check_image_on_ecr,backend-base,$(base_backend_image_tag)) || \ | ||
| $(docker) build --file $(root_dir)/govtool/backend/Dockerfile.base --tag "$(repo_url)/backend-base:$(base_backend_image_tag)" $(root_dir)/govtool/backend | ||
|
|
||
| .PHONY: push-backend-base | ||
| push-backend-base: build-backend-base | ||
| $(call check_image_on_ecr,backend-base,$(base_backend_image_tag)) || \ | ||
| $(docker) push $(repo_url)/backend-base:$(base_backend_image_tag) | ||
|
|
||
| .PHONY: build-backend | ||
| build-backend: build-backend-base | ||
| $(call check_image_on_ecr,backend,$(backend_image_tag)) || \ | ||
| $(docker) build --build-arg BASE_IMAGE_TAG=$(base_backend_image_tag) --tag "$(repo_url)/backend:$(backend_image_tag)" $(root_dir)/govtool/backend | ||
|
|
||
| .PHONY: push-backend | ||
| push-backend: push-backend-base build-backend | ||
| $(call check_image_on_ecr,backend,$(backend_image_tag)) || \ | ||
| $(docker) push $(repo_url)/backend:$(backend_image_tag) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { pkgs ? import <nixpkgs> {} }: | ||
| let | ||
| project = import ./default.nix { inherit pkgs; }; | ||
| in | ||
| project.overrideAttrs (attrs: { | ||
| buildInputs = attrs.buildInputs ++ (with pkgs; [ | ||
| awscli | ||
| docker | ||
| git | ||
| gnumake | ||
| ]); | ||
|
|
||
| shellHook = '' | ||
| ln -s ${project}/libexec/yarn-nix-example/node_modules node_modules | ||
| ''; | ||
| }) |
Oops, something went wrong.