use BUILD_VERSION with buildkite

superfly · Feb 3, 2019 · 5165e7d · 5165e7d
1 parent 3224e23
commit 5165e7d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -1,6 +1,6 @@
 steps:
   - commands:
-      - docker build --build-arg AWS_ACCESS_KEY_ID=AKIAIUEJ6IB7XWPIBUXA --build-arg AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY -t fly:$BUILDKITE_COMMIT .
+      - docker build --build_arg BUILD_VERSION=$BUILDKITE_COMMIT --build-arg AWS_ACCESS_KEY_ID=AKIAIUEJ6IB7XWPIBUXA --build-arg AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY -t fly:$BUILDKITE_COMMIT .
       - docker run --name fly_$BUILDKITE_COMMIT fly:$BUILDKITE_COMMIT /fly --help
       - docker cp fly_$BUILDKITE_COMMIT:/fly . && docker cp fly_$BUILDKITE_COMMIT:/fly-dist .
       - docker rm fly_$BUILDKITE_COMMIT

diff --git a/Dockerfile b/Dockerfile
@@ -137,6 +137,9 @@ RUN yarn install
 ADD v8env/ .
 ADD scripts/build-version.sh ../scripts/build-version.sh
 
+ARG BUILD_VERSION
+ENV BUILD_VERSION=$BUILD_VERSION
+
 RUN ./node_modules/.bin/rollup -c
 
 RUN ls -lah dist
@@ -174,6 +177,9 @@ RUN sccache --start-server \
 
 RUN target/release/create_snapshot v8env/dist/v8env.js v8env.bin
 
+ARG BUILD_VERSION
+ENV BUILD_VERSION=$BUILD_VERSION
+
 RUN sccache --start-server \
   && cargo build --target x86_64-alpine-linux-musl --no-default-features --release -p distributed-fly \
   && cargo build --target x86_64-alpine-linux-musl --no-default-features --release --bin fly \