Skip to content

Commit 32fd166

Browse files
author
Clyde Johnston
committed
Upgrade to newer OS and TeXLive versions (issue #9)
1 parent 9597c2f commit 32fd166

2 files changed

Lines changed: 12 additions & 10 deletions

File tree

texer/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
2-
# Builds the c_cpp/ubuntu-16.04 toolchain container.
2+
# Builds the c_cpp/ubuntu-18.04 toolchain container.
33
#
4-
FROM ubuntu:16.04
4+
FROM ubuntu:18.04
55

66
VOLUME /repo
77

@@ -40,7 +40,7 @@ RUN python3 -m pip install pygments
4040

4141
# install Powershell
4242
RUN apt-get -y install --no-install-recommends wget apt-transport-https
43-
RUN wget -q https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb && \
43+
RUN wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb && \
4444
dpkg -i packages-microsoft-prod.deb
4545
RUN apt-get update && \
4646
apt-get install -y powershell

texer/README.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,25 @@ texer latest d7ab132649d6
1818
```
1919

2020
```bash
21-
docker tag d7ab132649d6 uavcan/texer:ubuntu-16.04
21+
docker tag d7ab132649d6 uavcan/texer:ubuntu-18.04
22+
docker tag d7ab132649d6 uavcan/texer:latest
2223
docker login --username=yourhubusername
23-
docker push uavcan/texer:ubuntu-16.04
24+
docker push uavcan/texer:ubuntu-18.04
25+
docker push uavcan/texer:latest
2426
```
2527

2628
## Testing out the container
2729

2830
Start an interactive session:
2931

3032
```bash
31-
docker run --rm -it -v ${PWD}:/repo uavcan/texer:ubuntu-16.04
33+
docker run --rm -it -v ${PWD}:/repo uavcan/texer:ubuntu-18.04
3234
```
3335

3436
On macintosh you'll probably want to optimize osxfs with something like cached or delegated:
3537

3638
```bash
37-
docker run --rm -it -v ${PWD}:/repo:delegated uavcan/texer:ubuntu-16.04
39+
docker run --rm -it -v ${PWD}:/repo:delegated uavcan/texer:ubuntu-18.04
3840
```
3941

4042
See ["Performance tuning for volume mounts"](https://docs.docker.com/docker-for-mac/osxfs-caching/) for details.
@@ -48,10 +50,10 @@ services:
4850
- docker
4951
5052
before_install:
51-
- docker pull uavcan/texer:ubuntu-16.04
53+
- docker pull uavcan/texer:ubuntu-18.04
5254
5355
script:
54-
- docker run --rm -v $TRAVIS_BUILD_DIR:/repo uavcan/uavcan/texer:ubuntu-16.04 /bin/sh -c ./compile.sh
56+
- docker run --rm -v $TRAVIS_BUILD_DIR:/repo uavcan/uavcan/texer:ubuntu-18.04 /bin/sh -c ./compile.sh
5557
5658
```
5759

@@ -65,7 +67,7 @@ Example pipeline.yml:
6567
plugins:
6668
- docker#v3.5.0:
6769
workdir: /repo
68-
image: "uavcan/texer:ubuntu-16.04"
70+
image: "uavcan/texer:ubuntu-18.04"
6971
propagate-environment: true
7072
mount-ssh-agent: true
7173
```

0 commit comments

Comments
 (0)