Skip to content

Commit

Permalink
Merge pull request #90 from UQ-PAC/godbolt-boogie-direct
Browse files Browse the repository at this point in the history
Godbolt boogie direct, move godbolt to separate repo
  • Loading branch information
l-kent authored Oct 3, 2023
2 parents 87983bd + 1699346 commit 049af3b
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 469 deletions.
3 changes: 3 additions & 0 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ services:
build:
dockerfile: docker/godbolt.Dockerfile
network_mode: host
volumes:
- ./target/scala-3.1.0/:/target/scala-3.1.0/
# - ./docker/compiler-explorer:/compiler-explorer
ports:
- "10240:10240"

20 changes: 7 additions & 13 deletions docker/godbolt.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,28 @@ FROM ghcr.io/uq-pac/basil:latest as compiler-explorer
# https://github.com/madduci/docker-compiler-explorer/tree/master
RUN DEBIAN_FRONTEND=noninteractive apt-get update \
&& apt-get install -y curl \
&& curl -sL https://deb.nodesource.com/setup_18.x | bash - \
&& curl -sL https://deb.nodesource.com/setup_18.x | bash - \ # TODO: update install method
&& apt-get install -y \
wget \
ca-certificates \
nodejs \
make \
git \
dotnet6 \
&& dotnet tool install --global boogie || true \
&& apt-get install clang gcc gcc-13-aarch64-linux-gnu binutils-aarch64-linux-gnu gcc-13-cross-base libc6-dev-arm64-cross libc6-dev-armel-cross libc6-dev-armhf-cross libc6-dev-i386 -y \
&& apt-get autoremove --purge -y \
&& apt-get autoclean -y \
&& dotnet tool install --global boogie || true
&& rm -rf /var/cache/apt/* /tmp/*
# to force a new clone after a new commit
WORKDIR /compiler-explorer
ADD https://api.github.com/repos/ailrst/compiler-explorer/branches/main /tmp/head
RUN rm -rf /var/cache/apt/* /tmp/* \
&& git clone https://github.com/ailrst/compiler-explorer.git /compiler-explorer \
RUN \
git clone https://github.com/ailrst/compiler-explorer.git /compiler-explorer \
&& cd /compiler-explorer \
&& echo "Add missing dependencies" \
&& npm i @sentry/node \
&& npm run webpack
WORKDIR /compiler-explorer
RUN DEBIAN_FRONTEND=noninteractive apt-get update \
&& apt-get install clang gcc gcc-13-aarch64-linux-gnu binutils-aarch64-linux-gnu gcc-13-cross-base libc6-dev-arm64-cross libc6-dev-armel-cross libc6-dev-armhf-cross libc6-dev-i386 -y \
&& apt-get autoclean -y
ENTRYPOINT [ "make" ]
CMD ["run"]

FROM compiler-explorer AS ghcr.io/uq-pac/basil-compiler-explorer:latest
ADD docker/godbolt/basil-tool.py /compiler-explorer/basil-tool.py
RUN chmod +x /compiler-explorer/basil-tool.py
ADD docker/godbolt/basil.local.properties /compiler-explorer/etc/config/c.defaults.properties
ADD docker/godbolt/compiler-explorer.local.properties /compiler-explorer/etc/config/compiler-explorer.local.properties
252 changes: 0 additions & 252 deletions docker/godbolt/basil-tool.py

This file was deleted.

Loading

0 comments on commit 049af3b

Please sign in to comment.