Skip to content

Commit

Permalink
remove pinning of versions
Browse files Browse the repository at this point in the history
    Code that templates out applications with no migration path should
    not pin versions. It invariably leads to code that stagnates on
    outdated versions of tools.

    Removed the masking of makefile output. It provides little value
    and makes it harder to debug what make is doing.
  • Loading branch information
drewwells committed Mar 2, 2021
1 parent f0f0583 commit 7b0047f
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 19 deletions.
4 changes: 0 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
version: 2
updates:
- package-ecosystem: docker
directory: "/atlas/templates/docker"
schedule:
interval: daily
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
28 changes: 14 additions & 14 deletions atlas/templates/Makefile.common.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
PROJECT_ROOT ?= $(PWD)
BUILD_PATH ?= bin
DOCKERFILE_PATH ?= $(CURDIR)/docker
GO_IMAGE ?= golang:1.14-alpine
GO_IMAGE ?= golang:alpine
GO_RUNNER ?= $(DOCKER_RUNNER) $(GO_IMAGE)

# configuration for image names
Expand All @@ -28,7 +28,7 @@ GENERATOR ?= $(DOCKER_RUNNER) $(DOCKER_GENERATOR)
export GOFLAGS ?= -mod=vendor
GO_CACHE ?= -pkgdir $(BUILD_PATH)/go-cache
GO_BUILD_FLAGS ?= $(GO_CACHE) -i -v
GO_TEST_FLAGS ?= -v -cover
GO_TEST_FLAGS ?= -v -cover
GO_PACKAGES ?= $(shell go list ./... | grep -v vendor)


Expand Down Expand Up @@ -57,15 +57,15 @@ all-atlas: vendor-atlas protobuf-atlas docker-atlas

.PHONY fmt: fmt-atlas
fmt-atlas:
@$(GO_RUNNER) go fmt $(GO_PACKAGES)
$(GO_RUNNER) go fmt $(GO_PACKAGES)

.PHONY test: test-atlas
test-atlas: fmt-atlas
$(GO_RUNNER) go test $(GO_TEST_FLAGS) $(GO_PACKAGES)

docker-atlas:
@docker build -f $(SERVER_DOCKERFILE) -t $(SERVER_IMAGE):$(IMAGE_VERSION) .
@docker image prune -f --filter label=stage=server-intermediate
docker build --pull -f $(SERVER_DOCKERFILE) -t $(SERVER_IMAGE):$(IMAGE_VERSION) .
docker image prune -f --filter label=stage=server-intermediate

.docker-$(IMAGE_NAME)-$(IMAGE_VERSION):
$(MAKE) docker-atlas
Expand All @@ -78,7 +78,7 @@ push-atlas: docker
ifndef IMAGE_REGISTRY
@(echo "Please set IMAGE_REGISTRY variable in Makefile.vars to use push command"; exit 1)
else
@docker push $(SERVER_IMAGE):$(IMAGE_VERSION)
docker push $(SERVER_IMAGE):$(IMAGE_VERSION)
endif

.push-$(IMAGE_NAME)-$(IMAGE_VERSION):
Expand All @@ -90,33 +90,33 @@ push: .push-$(IMAGE_NAME)-$(IMAGE_VERSION)

.PHONY protobuf: protobuf-atlas
protobuf-atlas:
@$(GENERATOR) \
$(GENERATOR) \
$(PROTOBUF_ARGS) \
$(PROJECT_ROOT)/pkg/pb/service.proto

.PHONY vendor: vendor-atlas
vendor-atlas:
@go mod tidy
@go mod vendor
@go mod download
go mod tidy
go mod vendor
go mod download

.PHONY clean: clean-atlas
clean-atlas:
@docker rmi -f $(shell docker images -q $(SERVER_IMAGE)) || true
docker rmi -f $(shell docker images -q $(SERVER_IMAGE)) || true
rm .push-* .docker-*

.PHONY migrate-up: migrate-up-atlas
migrate-up-atlas:
ifeq ($(WITH_DATABASE), true)
@$(DOCKER_RUNNER) --net="host" $(MIGRATETOOL_IMAGE) --verbose --path=$(MIGRATION_PATH_IN_CONTAINER)/ --database.dsn=$(DATABASE_URL) up
$(DOCKER_RUNNER) --net="host" $(MIGRATETOOL_IMAGE) --verbose --path=$(MIGRATION_PATH_IN_CONTAINER)/ --database.dsn=$(DATABASE_URL) up
else
@echo "Your application doesn't have database, migrations aren't supported"
endif

.PHONY migrate-down: migrate-down-atlas
migrate-down-atlas:
ifeq ($(WITH_DATABASE), true)
@$(DOCKER_RUNNER) --net="host" $(MIGRATETOOL_IMAGE) --verbose --path=$(MIGRATION_PATH_IN_CONTAINER)/ --database.dsn=$(DATABASE_URL) down
$(DOCKER_RUNNER) --net="host" $(MIGRATETOOL_IMAGE) --verbose --path=$(MIGRATION_PATH_IN_CONTAINER)/ --database.dsn=$(DATABASE_URL) down
else
@echo "Your application doesn't have database, migrations aren't supported"
endif
Expand Down Expand Up @@ -145,7 +145,7 @@ helm-archive:

.PHONY: helm-properties
helm-properties: helm/tpl.helm.properties
@sed 's/{CHART_FILE}/$(CHART_FILE)/g' helm/tpl.helm.properties > helm.properties
sed 's/{CHART_FILE}/$(CHART_FILE)/g' helm/tpl.helm.properties > helm.properties

.PHONY: push-chart
push-chart: helm-lint helm-archive helm-properties
Expand Down
2 changes: 1 addition & 1 deletion atlas/templates/docker/Dockerfile.gotmpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# build the server binary
FROM golang:1.15.7 AS builder
FROM golang:latest AS builder
LABEL stage=server-intermediate
WORKDIR /go/src/{{ .Root }}/{{ .Name }}

Expand Down

0 comments on commit 7b0047f

Please sign in to comment.