Skip to content

Commit a713ac1

Browse files
committed
Disable publishing windows images
Update the readme, bump rust to 1.56.1
1 parent ac51ddf commit a713ac1

File tree

3 files changed

+30
-3
lines changed

3 files changed

+30
-3
lines changed

.github/workflows/docker.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,7 @@ jobs:
5959
VERSION=$VERSION-${{ matrix.config.version }}
6060
echo IMAGE_ID=$IMAGE_ID
6161
echo VERSION=$VERSION
62-
docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
63-
docker push $IMAGE_ID:$VERSION
62+
if ["$RUNNER_OS" == 'Linux']; then
63+
docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
64+
docker push $IMAGE_ID:$VERSION
65+
fi

README.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,27 @@
22
Docker images for Rust and LLVM
33

44
Allows building Rust applications with the LLVM dependencies on both Windows and Linux
5+
6+
For windows the images have to build locally after accepting the [Visual Studio license](https://go.microsoft.com/fwlink/?LinkId=2086102)
7+
8+
## Building the image
9+
Build the image using
10+
- Linux or WSL 2 __(Recommended)__:
11+
`docker build linux/Dockerfile -t rust-llvm`
12+
13+
- Windows containers :
14+
`docker build windows/Dockerfile -t rust-llvm`
15+
16+
## Usage
17+
18+
### Direct usage
19+
Pull the image using
20+
`docker pull ghcr.io/plc-lang/rust-llvm:latest-linux`
21+
22+
Run with
23+
`docker run -it -v $PWD:/build ghcr.io/plc-lang/rust-llvm:latest-linux`
24+
25+
### Importing
26+
27+
You can import the image into another Dockerfile using
28+
`FROM ghcr.io/plc-lang/rust-llvm:latest-linux`

linux/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM rust:1.56.1-bullseye
22

3+
# Fixed rust version to 1.56
4+
ARG RUST_VER=1.56.1
35
# Fixed rust version to 12
46
ARG LLVM_VER=12
57

@@ -26,7 +28,6 @@ RUN rustup toolchain install nightly \
2628
#Install documentation and coverage tools \
2729
&& cargo install mdbook grcov
2830

29-
3031
WORKDIR /build
3132
ENTRYPOINT ["bash"]
3233

0 commit comments

Comments
 (0)