Skip to content

Commit

Permalink
new container
Browse files Browse the repository at this point in the history
  • Loading branch information
ailrst committed Jan 30, 2024
1 parent f375c30 commit c31cac6
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
timeout-minutes: 10
container:
# Requires repo to have action access in package settings
image: ghcr.io/uq-pac/basil-dev:latest
image: ghcr.io/uq-pac/basil-nix-dev:latest
credentials:
username: ${{ github.actor }}
password: ${{ secrets.github_token }}
Expand Down
9 changes: 9 additions & 0 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ services:
volumes:
- ./:/host:rw
working_dir: /host
basil-nix-dev:
image: ghcr.io/uq-pac/basil-nix-dev:latest
build:
dockerfile: docker/nixdocker.Dockerfile
target: nix-dev-base
volumes:
- ./:/host:rw
working_dir: /host

basil-dev:
image: ghcr.io/uq-pac/basil-dev:latest
build:
Expand Down
7 changes: 3 additions & 4 deletions docker/asli.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ====
# ASLP
# ====
FROM ocaml/opam:ubuntu-23.04-ocaml-4.14 AS aslp
FROM docker.io/ocaml/opam:ubuntu-23.04-ocaml-4.14 AS aslp
USER root

# Install system dependencies
Expand Down Expand Up @@ -47,7 +47,7 @@ USER root
# it requires old versions of libffi and libtinfo and generally
# doesn't support ubuntu well.
# Opam install is the most reliable way.
FROM ocaml/opam:ubuntu-23.04-ocaml-4.14 AS aslp-bap
FROM docker.io/ocaml/opam:ubuntu-23.04-ocaml-4.14 AS aslp-bap
USER root
# Install system dependencies
RUN apt-get update && apt-get install -y python3 libgmp-dev yasm m4 \
Expand Down Expand Up @@ -112,11 +112,10 @@ USER root
# =======================
# BASIL build environment
# =======================
FROM ubuntu:23.04 AS scala
FROM docker.io/ubuntu:23.04 AS scala
ENV PATH="$PATH:/root/.local/share/coursier/bin"
RUN apt-get update && apt-get install default-jre-headless curl git --yes \
&& curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x86_64-pc-linux.gz | gzip -d > cs && chmod +x cs && ./cs setup --yes \
&& apt-get remove curl --yes \
&& apt-get autoremove --purge -y \
&& apt-get autoclean -y

Expand Down
9 changes: 9 additions & 0 deletions docker/nixdocker.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

FROM docker.io/nixos/nix:latest AS nix-dev-base
RUN nix-channel --update
RUN printf '%s\n' "extra-experimental-features = nix-command flakes" "extra-trusted-users = $USER" | tee -a /etc/nix/nix.conf
RUN nix profile install --impure 'github:katrinafyi/pac-nix#aslp'
RUN nix profile install --impure 'github:katrinafyi/pac-nix#bap-aslp'
RUN nix profile install --impure 'nixpkgs#boogie'
RUN nix profile install --impure 'nixpkgs#openjdk'
RUN nix profile install --impure 'nixpkgs#coursier' && cs setup --yes && cs install mill --yes

0 comments on commit c31cac6

Please sign in to comment.