aherman
/
boundary
mirror of https://github.com/hashicorp/boundary
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Docker Mirror + packagespec0.1.8 + go1.15.3 (#762)

Browse Source 
* packagespec upgrade -version 0.1.8

* build: use hc mirror for base image

* build: upgrade to go1.15.3
pull/778/head
Sam Salisbury 6 years ago committed by GitHub
parent 4550088205
commit 00c8b757ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 1875 additions and 2278 deletions
Show Stats Download Patch File Download Diff File

804
.circleci/config.yml generated
View File

File diff suppressed because it is too large Load Diff

1522
.circleci/config/@build-release.yml
View File

File diff suppressed because it is too large Load Diff

15
packages-oss.lock/Makefile generated
Unescape View File

@ -161,6 +161,21 @@ package-meta:
echo "$$COMMAND"; \
$(SHELL) "$$COMMAND"
# package-meta expects PACKAGE_SPEC_ID to already be set, use this in CI.
package-meta-all:
@$(call DIRTY_SOURCE_WARNING,WRITING DIRTY METADATA FOR DIRTY PACKAGES)
@PACKAGE_SPEC_IDS="$$($(call QUERY_LOCK,.packages[] | .packagespecid))"; \
COUNT=$$(echo $$PACKAGE_SPEC_IDS | wc -w | xargs); \
echo "==> Writing $$COUNT packages' metadata..."; \
for PACKAGE_SPEC_ID in $$PACKAGE_SPEC_IDS; do \
export PACKAGE_SPEC_ID; \
FILE="$(PACKAGE_SOURCE_ID)-$${PACKAGE_SPEC_ID}.zip.meta.json"; \
OUT="$(PACKAGE_STORE)/$$FILE"; \
COMMAND="$(call QUERY_PACKAGESPEC_BY_ID,env.PACKAGE_SPEC_ID,.) > $$OUT"; \
echo "$$COMMAND"; \
$(SHELL) "$$COMMAND"; \
done
# aliases writes all alias symlinks for packages in the package store that
# match the current LOCKFILE and PRODUCT_REVISION. It does not cause a new build.
# If the package store contains no matchin binaries, then this does nothing.

8
packages-oss.lock/build.mk generated
Unescape View File

@ -18,14 +18,6 @@ ifneq ($(PRODUCT_VERSION),)
$(error You cannot set PRODUCT_VERSION for local builds, did you mean PRODUCT_REVISION?)
endif
# PACKAGES_ROOT holds the package store, as well as other package aliases.
PACKAGES_ROOT := $(CACHE_ROOT)/packages
# PACKAGE_STORE is where we store all the package files themselves
# addressed by their input hashes.
PACKAGE_STORE := $(PACKAGES_ROOT)/store
# BY_ALIAS is where we store alias symlinks to the store.
BY_ALIAS := $(PACKAGES_ROOT)/by-alias
# Include the layers driver.
include $(LOCKDIR)/layer.mk

18
packages-oss.lock/config.mk generated
Unescape View File

@ -19,11 +19,23 @@ REPO_ROOT := $(shell git rev-parse --show-toplevel)
# automatically.
AUTO_INSTALL_TOOLS ?= NO
define ENSURE_GITIGNORE_ALL
_ := $(shell cd "$(REPO_ROOT)" && [ -f "$(1)/.gitignore" ] || { mkdir -p "$(1)"; echo '*' > "$(1)/.gitignore"; })
endef
# CACHE_ROOT is the build cache directory.
CACHE_ROOT ?= .buildcache
CACHE_GITIGNORE := $(CACHE_ROOT)/.gitignore
$(shell [ -f $(CACHE_GITIGNORE) ] || { mkdir -p $(CACHE_ROOT); echo '*' > $(CACHE_GITIGNORE); })
_ := $(call ENSURE_GITIGNORE_ALL,$(CACHE_ROOT))
# PACKAGES_ROOT holds the package store, as well as other package aliases.
PACKAGES_ROOT := $(CACHE_ROOT)/packages
_ := $(call ENSURE_GITIGNORE_ALL,$(PACKAGES_ROOT))
# PACKAGE_STORE is where we store all the package files themselves
# addressed by their input hashes.
PACKAGE_STORE := $(PACKAGES_ROOT)/store
_ := $(call ENSURE_GITIGNORE_ALL,$(PACKAGE_STORE))
# BY_ALIAS is where we store alias symlinks to the store.
BY_ALIAS := $(PACKAGES_ROOT)/by-alias
_ := $(call ENSURE_GITIGNORE_ALL,$(BY_ALIAS))
# SPEC is the human-managed description of which packages we are able to build.
SPEC_FILE_PATTERN := packages*.yml

64
packages-oss.lock/layers/layers.mk generated
Unescape View File

@ -2,38 +2,38 @@
# WARNING: Do not EDIT or MERGE this file, it is generated by packagespec.
# ***
LAYER_00-base-b035732a9181cb923e58b88eff262c379a1a1ad2_ID := 00-base-b035732a9181cb923e58b88eff262c379a1a1ad2
LAYER_00-base-b035732a9181cb923e58b88eff262c379a1a1ad2_TYPE := base
LAYER_00-base-b035732a9181cb923e58b88eff262c379a1a1ad2_BASE_LAYER :=
LAYER_00-base-b035732a9181cb923e58b88eff262c379a1a1ad2_SOURCE_INCLUDE :=
LAYER_00-base-b035732a9181cb923e58b88eff262c379a1a1ad2_SOURCE_EXCLUDE :=
LAYER_00-base-b035732a9181cb923e58b88eff262c379a1a1ad2_CACHE_KEY_FILE := .buildcache/cache-keys/base-b035732a9181cb923e58b88eff262c379a1a1ad2
LAYER_00-base-b035732a9181cb923e58b88eff262c379a1a1ad2_ARCHIVE_FILE := .buildcache/archives/00-base-b035732a9181cb923e58b88eff262c379a1a1ad2.tar.gz
$(eval $(call LAYER,$(LAYER_00-base-b035732a9181cb923e58b88eff262c379a1a1ad2_ID),$(LAYER_00-base-b035732a9181cb923e58b88eff262c379a1a1ad2_TYPE),$(LAYER_00-base-b035732a9181cb923e58b88eff262c379a1a1ad2_BASE_LAYER),$(LAYER_00-base-b035732a9181cb923e58b88eff262c379a1a1ad2_SOURCE_INCLUDE),$(LAYER_00-base-b035732a9181cb923e58b88eff262c379a1a1ad2_SOURCE_EXCLUDE),$(LAYER_00-base-b035732a9181cb923e58b88eff262c379a1a1ad2_CACHE_KEY_FILE),$(LAYER_00-base-b035732a9181cb923e58b88eff262c379a1a1ad2_ARCHIVE_FILE)))
LAYER_00-base-98f69f83d190f966153d11e8dd1e994f2563d3c8_ID := 00-base-98f69f83d190f966153d11e8dd1e994f2563d3c8
LAYER_00-base-98f69f83d190f966153d11e8dd1e994f2563d3c8_TYPE := base
LAYER_00-base-98f69f83d190f966153d11e8dd1e994f2563d3c8_BASE_LAYER :=
LAYER_00-base-98f69f83d190f966153d11e8dd1e994f2563d3c8_SOURCE_INCLUDE :=
LAYER_00-base-98f69f83d190f966153d11e8dd1e994f2563d3c8_SOURCE_EXCLUDE :=
LAYER_00-base-98f69f83d190f966153d11e8dd1e994f2563d3c8_CACHE_KEY_FILE := .buildcache/cache-keys/base-98f69f83d190f966153d11e8dd1e994f2563d3c8
LAYER_00-base-98f69f83d190f966153d11e8dd1e994f2563d3c8_ARCHIVE_FILE := .buildcache/archives/00-base-98f69f83d190f966153d11e8dd1e994f2563d3c8.tar.gz
$(eval $(call LAYER,$(LAYER_00-base-98f69f83d190f966153d11e8dd1e994f2563d3c8_ID),$(LAYER_00-base-98f69f83d190f966153d11e8dd1e994f2563d3c8_TYPE),$(LAYER_00-base-98f69f83d190f966153d11e8dd1e994f2563d3c8_BASE_LAYER),$(LAYER_00-base-98f69f83d190f966153d11e8dd1e994f2563d3c8_SOURCE_INCLUDE),$(LAYER_00-base-98f69f83d190f966153d11e8dd1e994f2563d3c8_SOURCE_EXCLUDE),$(LAYER_00-base-98f69f83d190f966153d11e8dd1e994f2563d3c8_CACHE_KEY_FILE),$(LAYER_00-base-98f69f83d190f966153d11e8dd1e994f2563d3c8_ARCHIVE_FILE)))
LAYER_01-ui-a46925cd79db8d8f17f005774b1f4faef82d83b6_ID := 01-ui-a46925cd79db8d8f17f005774b1f4faef82d83b6
LAYER_01-ui-a46925cd79db8d8f17f005774b1f4faef82d83b6_TYPE := ui
LAYER_01-ui-a46925cd79db8d8f17f005774b1f4faef82d83b6_BASE_LAYER := 00-base-b035732a9181cb923e58b88eff262c379a1a1ad2
LAYER_01-ui-a46925cd79db8d8f17f005774b1f4faef82d83b6_SOURCE_INCLUDE := internal/ui/VERSION
LAYER_01-ui-a46925cd79db8d8f17f005774b1f4faef82d83b6_SOURCE_EXCLUDE :=
LAYER_01-ui-a46925cd79db8d8f17f005774b1f4faef82d83b6_CACHE_KEY_FILE := .buildcache/cache-keys/ui-a46925cd79db8d8f17f005774b1f4faef82d83b6
LAYER_01-ui-a46925cd79db8d8f17f005774b1f4faef82d83b6_ARCHIVE_FILE := .buildcache/archives/01-ui-a46925cd79db8d8f17f005774b1f4faef82d83b6.tar.gz
$(eval $(call LAYER,$(LAYER_01-ui-a46925cd79db8d8f17f005774b1f4faef82d83b6_ID),$(LAYER_01-ui-a46925cd79db8d8f17f005774b1f4faef82d83b6_TYPE),$(LAYER_01-ui-a46925cd79db8d8f17f005774b1f4faef82d83b6_BASE_LAYER),$(LAYER_01-ui-a46925cd79db8d8f17f005774b1f4faef82d83b6_SOURCE_INCLUDE),$(LAYER_01-ui-a46925cd79db8d8f17f005774b1f4faef82d83b6_SOURCE_EXCLUDE),$(LAYER_01-ui-a46925cd79db8d8f17f005774b1f4faef82d83b6_CACHE_KEY_FILE),$(LAYER_01-ui-a46925cd79db8d8f17f005774b1f4faef82d83b6_ARCHIVE_FILE)))
LAYER_01-ui-e61ed430f24599db65f898efe41246153ab41005_ID := 01-ui-e61ed430f24599db65f898efe41246153ab41005
LAYER_01-ui-e61ed430f24599db65f898efe41246153ab41005_TYPE := ui
LAYER_01-ui-e61ed430f24599db65f898efe41246153ab41005_BASE_LAYER := 00-base-98f69f83d190f966153d11e8dd1e994f2563d3c8
LAYER_01-ui-e61ed430f24599db65f898efe41246153ab41005_SOURCE_INCLUDE := internal/ui/VERSION
LAYER_01-ui-e61ed430f24599db65f898efe41246153ab41005_SOURCE_EXCLUDE :=
LAYER_01-ui-e61ed430f24599db65f898efe41246153ab41005_CACHE_KEY_FILE := .buildcache/cache-keys/ui-e61ed430f24599db65f898efe41246153ab41005
LAYER_01-ui-e61ed430f24599db65f898efe41246153ab41005_ARCHIVE_FILE := .buildcache/archives/01-ui-e61ed430f24599db65f898efe41246153ab41005.tar.gz
$(eval $(call LAYER,$(LAYER_01-ui-e61ed430f24599db65f898efe41246153ab41005_ID),$(LAYER_01-ui-e61ed430f24599db65f898efe41246153ab41005_TYPE),$(LAYER_01-ui-e61ed430f24599db65f898efe41246153ab41005_BASE_LAYER),$(LAYER_01-ui-e61ed430f24599db65f898efe41246153ab41005_SOURCE_INCLUDE),$(LAYER_01-ui-e61ed430f24599db65f898efe41246153ab41005_SOURCE_EXCLUDE),$(LAYER_01-ui-e61ed430f24599db65f898efe41246153ab41005_CACHE_KEY_FILE),$(LAYER_01-ui-e61ed430f24599db65f898efe41246153ab41005_ARCHIVE_FILE)))
LAYER_02-go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf_ID := 02-go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf
LAYER_02-go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf_TYPE := go-modules
LAYER_02-go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf_BASE_LAYER := 01-ui-a46925cd79db8d8f17f005774b1f4faef82d83b6
LAYER_02-go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf_SOURCE_INCLUDE := go.mod go.sum */go.mod */go.sum
LAYER_02-go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf_SOURCE_EXCLUDE :=
LAYER_02-go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf_CACHE_KEY_FILE := .buildcache/cache-keys/go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf
LAYER_02-go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf_ARCHIVE_FILE := .buildcache/archives/02-go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf.tar.gz
$(eval $(call LAYER,$(LAYER_02-go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf_ID),$(LAYER_02-go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf_TYPE),$(LAYER_02-go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf_BASE_LAYER),$(LAYER_02-go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf_SOURCE_INCLUDE),$(LAYER_02-go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf_SOURCE_EXCLUDE),$(LAYER_02-go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf_CACHE_KEY_FILE),$(LAYER_02-go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf_ARCHIVE_FILE)))
LAYER_02-go-modules-d886f439beac33e5bafaaef19e9448be91000100_ID := 02-go-modules-d886f439beac33e5bafaaef19e9448be91000100
LAYER_02-go-modules-d886f439beac33e5bafaaef19e9448be91000100_TYPE := go-modules
LAYER_02-go-modules-d886f439beac33e5bafaaef19e9448be91000100_BASE_LAYER := 01-ui-e61ed430f24599db65f898efe41246153ab41005
LAYER_02-go-modules-d886f439beac33e5bafaaef19e9448be91000100_SOURCE_INCLUDE := go.mod go.sum */go.mod */go.sum
LAYER_02-go-modules-d886f439beac33e5bafaaef19e9448be91000100_SOURCE_EXCLUDE :=
LAYER_02-go-modules-d886f439beac33e5bafaaef19e9448be91000100_CACHE_KEY_FILE := .buildcache/cache-keys/go-modules-d886f439beac33e5bafaaef19e9448be91000100
LAYER_02-go-modules-d886f439beac33e5bafaaef19e9448be91000100_ARCHIVE_FILE := .buildcache/archives/02-go-modules-d886f439beac33e5bafaaef19e9448be91000100.tar.gz
$(eval $(call LAYER,$(LAYER_02-go-modules-d886f439beac33e5bafaaef19e9448be91000100_ID),$(LAYER_02-go-modules-d886f439beac33e5bafaaef19e9448be91000100_TYPE),$(LAYER_02-go-modules-d886f439beac33e5bafaaef19e9448be91000100_BASE_LAYER),$(LAYER_02-go-modules-d886f439beac33e5bafaaef19e9448be91000100_SOURCE_INCLUDE),$(LAYER_02-go-modules-d886f439beac33e5bafaaef19e9448be91000100_SOURCE_EXCLUDE),$(LAYER_02-go-modules-d886f439beac33e5bafaaef19e9448be91000100_CACHE_KEY_FILE),$(LAYER_02-go-modules-d886f439beac33e5bafaaef19e9448be91000100_ARCHIVE_FILE)))
LAYER_03-copy-source-ca8ebf7592f88b86f492c947caab70914efd951c_ID := 03-copy-source-ca8ebf7592f88b86f492c947caab70914efd951c
LAYER_03-copy-source-ca8ebf7592f88b86f492c947caab70914efd951c_TYPE := copy-source
LAYER_03-copy-source-ca8ebf7592f88b86f492c947caab70914efd951c_BASE_LAYER := 02-go-modules-c11d3353178a39d328136d8a9669c4a16e6b6edf
LAYER_03-copy-source-ca8ebf7592f88b86f492c947caab70914efd951c_SOURCE_INCLUDE := *.go
LAYER_03-copy-source-ca8ebf7592f88b86f492c947caab70914efd951c_SOURCE_EXCLUDE :=
LAYER_03-copy-source-ca8ebf7592f88b86f492c947caab70914efd951c_CACHE_KEY_FILE := .buildcache/cache-keys/copy-source-ca8ebf7592f88b86f492c947caab70914efd951c
LAYER_03-copy-source-ca8ebf7592f88b86f492c947caab70914efd951c_ARCHIVE_FILE := .buildcache/archives/03-copy-source-ca8ebf7592f88b86f492c947caab70914efd951c.tar.gz
$(eval $(call LAYER,$(LAYER_03-copy-source-ca8ebf7592f88b86f492c947caab70914efd951c_ID),$(LAYER_03-copy-source-ca8ebf7592f88b86f492c947caab70914efd951c_TYPE),$(LAYER_03-copy-source-ca8ebf7592f88b86f492c947caab70914efd951c_BASE_LAYER),$(LAYER_03-copy-source-ca8ebf7592f88b86f492c947caab70914efd951c_SOURCE_INCLUDE),$(LAYER_03-copy-source-ca8ebf7592f88b86f492c947caab70914efd951c_SOURCE_EXCLUDE),$(LAYER_03-copy-source-ca8ebf7592f88b86f492c947caab70914efd951c_CACHE_KEY_FILE),$(LAYER_03-copy-source-ca8ebf7592f88b86f492c947caab70914efd951c_ARCHIVE_FILE)))
LAYER_03-copy-source-eddb505020fec64e127253c8618061565d52d2a7_ID := 03-copy-source-eddb505020fec64e127253c8618061565d52d2a7
LAYER_03-copy-source-eddb505020fec64e127253c8618061565d52d2a7_TYPE := copy-source
LAYER_03-copy-source-eddb505020fec64e127253c8618061565d52d2a7_BASE_LAYER := 02-go-modules-d886f439beac33e5bafaaef19e9448be91000100
LAYER_03-copy-source-eddb505020fec64e127253c8618061565d52d2a7_SOURCE_INCLUDE := *.go
LAYER_03-copy-source-eddb505020fec64e127253c8618061565d52d2a7_SOURCE_EXCLUDE :=
LAYER_03-copy-source-eddb505020fec64e127253c8618061565d52d2a7_CACHE_KEY_FILE := .buildcache/cache-keys/copy-source-eddb505020fec64e127253c8618061565d52d2a7
LAYER_03-copy-source-eddb505020fec64e127253c8618061565d52d2a7_ARCHIVE_FILE := .buildcache/archives/03-copy-source-eddb505020fec64e127253c8618061565d52d2a7.tar.gz
$(eval $(call LAYER,$(LAYER_03-copy-source-eddb505020fec64e127253c8618061565d52d2a7_ID),$(LAYER_03-copy-source-eddb505020fec64e127253c8618061565d52d2a7_TYPE),$(LAYER_03-copy-source-eddb505020fec64e127253c8618061565d52d2a7_BASE_LAYER),$(LAYER_03-copy-source-eddb505020fec64e127253c8618061565d52d2a7_SOURCE_INCLUDE),$(LAYER_03-copy-source-eddb505020fec64e127253c8618061565d52d2a7_SOURCE_EXCLUDE),$(LAYER_03-copy-source-eddb505020fec64e127253c8618061565d52d2a7_CACHE_KEY_FILE),$(LAYER_03-copy-source-eddb505020fec64e127253c8618061565d52d2a7_ARCHIVE_FILE)))

1697
packages-oss.lock/pkgs.yml generated
View File

File diff suppressed because it is too large Load Diff

4
packages-oss.yml
Unescape View File

@ -50,8 +50,8 @@ package-aliases:
template: >-
boundary/{{.BUNDLE_NAME}}/{{.BUNDLE_NAME}}_{{.GOOS}}_{{.GOARCH}}.zip
# golang@sha256:29452ef08bd0535f550c47b6034522c82ac10517b49c5f3b7a00035ecee0089e = golang:1.15.2-buster
base-image: "golang@sha256:29452ef08bd0535f550c47b6034522c82ac10517b49c5f3b7a00035ecee0089e"
# golang@sha256:fb04edf20446eed8af9eb6137d02fdf607f47028a0a806131f8b175a09620aab = golang:1.15.3-buster
base-image: "hashicorp.jfrog.io/docker/golang@sha256:fb04edf20446eed8af9eb6137d02fdf607f47028a0a806131f8b175a09620aab"
layers:
- name: base

21
packagespec.mk generated
Unescape View File

@ -41,7 +41,7 @@ export PACKAGE_SPEC_ID LAYER_SPEC_ID PRODUCT_REVISION PRODUCT_VERSION
# PASSTHROUGH_TARGETS are convenience aliases for targets defined in $(LOCKDIR)/Makefile
PASSTHROUGH_TARGETS := \
build package-contents copy-package-contents build-all \
aliases meta package package-meta \
aliases meta package package-meta package-meta-all \
build-ci watch-ci \
stage-config stage custom-build custom-build-config\
list-custom-builds \
@ -58,7 +58,7 @@ $(PASSTHROUGH_TARGETS) $(LOCAL_TARGETS): SHELL := $(PACKAGESPEC_SHELL)
$(PASSTHROUGH_TARGETS):
@PRODUCT_REPO_ROOT="$(call RUN,git rev-parse --show-toplevel)" $(MAKE) -C $(LOCKDIR) $@
# packages regenerates $(LOCKDIR) from $(SPEC) using packagespec. This is only for
# packages regenerates build and CI config using packagespec. This is only for
# internal HashiCorp use, as it has dependencies not available externally.
.PHONY: packages
packages:
@ -67,17 +67,8 @@ packages:
echo "Note: packagespec is only available to HashiCorp employees at present."; \
exit 1; \
}
@packagespec lock
@$(MAKE) $(PACKAGESPEC_CIRCLECI_CONFIG)
@packagespec lock -circleciconfig="$(PACKAGESPEC_CIRCLECI_CONFIG)"
@$(MAKE) packagespec-circleci-config
CIRCLECI_PRIMARY_TPL := .packagespec/templates/circleci-primary.yml.tpl
$(PACKAGESPEC_CIRCLECI_CONFIG): $(LOCKFILE) $(CIRCLECI_PRIMARY_TPL)
@\
echo "==> Updating $(PACKAGESPEC_CIRCLECI_CONFIG)..."; \
mkdir -p "$(dir $@)"; \
cat $< | gomplate -f $(CIRCLECI_PRIMARY_TPL) -d 'lock-file=stdin://?type=application/yaml' > $@; \
$(PACKAGESPEC_HOOK_POST_CI_CONFIG)
# This target is needed by packagespec, do not remove.
packagespec-circleci-config: $(PACKAGESPEC_CIRCLECI_CONFIG)
packagespec-circleci-config:
@$(PACKAGESPEC_HOOK_POST_CI_CONFIG)

Write Preview
Loading…
Cancel
Save