Skip to content

Commit 62ae05c

Browse files
committed
Update docker to update purescript, spago, node
- purescript 0.15.4 - spago 0.20.9 - node 16 (lts)
1 parent f7ef7ec commit 62ae05c

File tree

3 files changed

+14
-23
lines changed

3 files changed

+14
-23
lines changed

Dockerfile

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,13 @@ RUN set -ex; \
66
chown -R codewarrior: /workspace;
77

88
RUN set -ex; \
9-
curl -sL https://deb.nodesource.com/setup_8.x | bash -; \
9+
curl -sL https://deb.nodesource.com/setup_16.x | bash -; \
1010
apt-get install -y nodejs; \
1111
apt-get clean; \
1212
rm -rf /var/lib/apt/lists/* /tmp/*;
1313

14-
RUN set -ex; \
15-
mkdir -p /opt/purescript; \
16-
curl -fsSL https://github.com/purescript/purescript/releases/download/v0.12.2/linux64.tar.gz | tar xz -C /opt/purescript --strip-components=1; \
17-
curl -fsSL https://github.com/purescript/psc-package/releases/download/v0.5.1/linux64.tar.gz | tar xz -C /opt/purescript --strip-components=1;
18-
19-
RUN npm install -g [email protected];
14+
RUN npm install -g [email protected];
15+
RUN npm install -g [email protected];
2016

2117
COPY --chown=codewarrior:codewarrior workspace/ /workspace
2218
WORKDIR /workspace
@@ -28,20 +24,15 @@ ENV USER=codewarrior \
2824
PATH=/opt/purescript:$PATH
2925

3026
RUN set -ex; \
31-
# TODO Properly package the reporter and install
32-
mkdir /tmp/reporter; \
33-
curl -fsSL https://github.com/codewars/purescript-spec-reporter-codewars/archive/refs/tags/v0.0.1.tar.gz | tar xz -C /tmp/reporter --strip-components=1; \
34-
mv /tmp/reporter/src/Test /workspace/src/Test; \
35-
rm -rf /tmp/reporter; \
3627
cd /workspace; \
3728
npm install; \
38-
# install packages
39-
psc-package install; \
40-
# compile packages
41-
psc-package build; \
42-
# ensure running `Main.purs` works
43-
pulp run; \
44-
# ensure testing works
45-
pulp test || true; \
46-
# clean up
29+
# install packages
30+
spago install; \
31+
# compile packages
32+
spago build; \
33+
# ensure running `Main.purs` works
34+
spago run; \
35+
# ensure testing works
36+
spago test || true; \
37+
# clean up
4738
rm -rf ./src/Main.purs ./output/Main/ ./test/Example/ ./output/Example.ExampleSpec/;

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Container image for PureScript
77
```bash
88
W=/workspace
99
# Create container
10-
C=$(docker container create --rm -w $W ghcr.io/codewars/purescript:latest pulp test)
10+
C=$(docker container create --rm -w $W ghcr.io/codewars/purescript:latest spago test)
1111

1212
# Copy files from the examples directory
1313
docker container cp ./examples/passing/. $C:$W

bin/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ fi
88
W=/workspace
99

1010
# Create container
11-
C=$(docker container create --rm -w $W $IMAGE pulp test)
11+
C=$(docker container create --rm -w $W $IMAGE spago test)
1212

1313
# Copy files from the examples directory
1414
docker container cp examples/${1:-passing}/. $C:$W

0 commit comments

Comments
 (0)