Skip to content

Commit 8d5f33d

Browse files
committed
uprev CI docker image
1 parent 5bbf583 commit 8d5f33d

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
jobs:
33
build:
44
docker:
5-
- image: hikalium/liumos-builder:v20210129_021600
5+
- image: hikalium/liumos-builder:v20210627_180133
66
steps:
77
- checkout
88
- run:

builder/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ RUN apt-get update \
3434
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
3535
sh -s -- -y --default-toolchain=nightly-x86_64-unknown-linux-gnu
3636
ENV PATH $PATH:/root/.cargo/bin
37+
ARG RUST_VERSION_DATE=2021-06-27
38+
RUN rustup toolchain install nightly-${RUST_VERSION_DATE} && rustup default nightly-${RUST_VERSION_DATE}
3739
RUN rustup component add rust-src
3840

3941
RUN pip3 install pexpect

builder/Makefile

+9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
CIRCLECI_DOCKER_VERSION := $(shell cat ../.circleci/config.yml | grep image | grep liumos-builder | cut -d ':' -f 2- | tr -d ' ')
22

3+
IMAGE_TAG:=hikalium/liumos-builder:v$(shell date +%Y%m%d_%H%M%S)
4+
5+
build:
6+
docker build -t ${IMAGE_TAG} .
7+
@ echo
8+
@ echo ${IMAGE_TAG}
9+
@ echo Run \"docker push ${IMAGE_TAG}\" to upload this image.
10+
@ echo Also, please make sure to update .circleci/config.yml.
11+
312
run_ci_version:
413
docker run -it $(CIRCLECI_DOCKER_VERSION)

0 commit comments

Comments
 (0)