Skip to content

Commit 9c9f525

Browse files
authored
fix tf validation and docker binary building (#94)
1 parent d306512 commit 9c9f525

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
FROM public.ecr.aws/bitnami/golang:1.16 as builder
33

44
## GOLANG env
5-
ENV GOPROXY="https://proxy.golang.org|direct"
6-
ENV GO111MODULE="on"
7-
ENV CGO_ENABLED=0
8-
ENV GOOS=linux
9-
ENV GOARCH=amd64
5+
ARG GOPROXY="https://proxy.golang.org|direct"
6+
ARG GO111MODULE="on"
7+
ARG CGO_ENABLED=0
8+
ARG GOOS=linux
9+
ARG GOARCH=amd64
1010

1111
# Copy go.mod and download dependencies
1212
WORKDIR /amazon-ec2-instance-selector

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ docker-push:
4141
docker push ${IMG_W_TAG}
4242

4343
build-docker-images:
44-
${MAKEFILE_PATH}/scripts/build-docker-images -p ${SUPPORTED_PLATFORMS} -r ${IMG} -v ${VERSION}
44+
${MAKEFILE_PATH}/scripts/build-docker-images -d -p ${SUPPORTED_PLATFORMS} -r ${IMG} -v ${VERSION}
4545

4646
push-docker-images:
4747
@docker login -u ${DOCKERHUB_USERNAME} -p="${DOCKERHUB_TOKEN}"
@@ -80,7 +80,7 @@ output-validation-test:
8080
${MAKEFILE_PATH}/test/output-validation-test/test-output-validation
8181

8282
build-binaries:
83-
${MAKEFILE_PATH}/scripts/build-binaries -p ${SUPPORTED_PLATFORMS} -v ${VERSION}
83+
${MAKEFILE_PATH}/scripts/build-binaries -d -p ${SUPPORTED_PLATFORMS} -v ${VERSION}
8484

8585
## requires a github token
8686
upload-resources-to-github:

test/output-validation-test/test-output-validation

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ docker run --rm -v $BUILD_DIR:/data cfn-lint /data/cfn.yaml
2929
echo "✅ Passed CFN YAML and JSON Validation"
3030

3131
## Terraform Validation
32-
$BUILD_DIR/bin/ec2-instance-selector-$PLATFORM -o terraform-hcl > $BUILD_DIR/terraform.hcl
33-
docker run -it --rm -v $BUILD_DIR:/data hashicorp/terraform:light init -backend=false /data/
34-
docker run -it --rm -v $BUILD_DIR:/data hashicorp/terraform:light validate -json /data/
32+
$BUILD_DIR/bin/ec2-instance-selector-$PLATFORM -o terraform-hcl > $BUILD_DIR/terraform.tf
33+
docker run -it --rm -v $BUILD_DIR:/data -w /data hashicorp/terraform:light init -backend=false
34+
docker run -it --rm -v $BUILD_DIR:/data -w /data hashicorp/terraform:light validate -json
3535

3636
echo "✅ Passed Terraform HCL Validation"

0 commit comments

Comments
 (0)