Skip to content

Commit f3106a2

Browse files
committed
Upgrade docker image to Ubuntu focal
See emscripten-core/emsdk#1183
1 parent 133dd9d commit f3106a2

File tree

2 files changed

+24
-28
lines changed

2 files changed

+24
-28
lines changed

Dockerfile

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Base Image
2-
FROM buildpack-deps:bionic
2+
FROM buildpack-deps:focal
33

44
## Package Installation (apt-get)
55
RUN EXTRA_CHROME_DEPS="lsb-release fonts-liberation libappindicator3-1" \
@@ -12,7 +12,6 @@ RUN EXTRA_CHROME_DEPS="lsb-release fonts-liberation libappindicator3-1" \
1212
build-essential \
1313
cmake \
1414
openjdk-8-jre-headless `# openjdk-9 is also available, but hits #7232` \
15-
python-pip \
1615
python-setuptools \
1716
python3 \
1817
python3-pip \
@@ -34,8 +33,5 @@ RUN EXTRA_CHROME_DEPS="lsb-release fonts-liberation libappindicator3-1" \
3433
&& apt-get clean
3534

3635
## Package Installation (pip)
37-
RUN python2 -m pip install --no-cache-dir --upgrade pip \
38-
&& python2 -m pip install --no-cache-dir flake8==3.7.8
39-
4036
RUN python3 -m pip install --no-cache-dir --upgrade pip \
4137
&& python3 -m pip install --no-cache-dir flake8==3.7.8

README.md

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
# Emscripten CI
22

3-
The main purpose of this repository is hosting the [Dockerfile](./Dockerfile)
4-
for building the Docker image used for the
5-
[Emscripten CircleCI build](https://circleci.com/gh/emscripten-core/emscripten).
3+
The main purpose of this repository is hosting the [Dockerfile](./Dockerfile)
4+
for building the Docker image used for the
5+
[Emscripten CircleCI build](https://circleci.com/gh/emscripten-core/emscripten).
66

7-
## :whale: Pre-built Docker Image
8-
This [Dockerfile](./Dockerfile) allows to build a Docker image, with the tools
9-
required for the Emscripten CI build. The image is hosted at
10-
[Docker Hub](https://hub.docker.com/r/emscripten/emscripten-ci) and used
11-
by the [CircleCI Emscripten Project](https://circleci.com/gh/emscripten-core/emscripten).
7+
## :whale: Pre-built Docker Image
8+
This [Dockerfile](./Dockerfile) allows to build a Docker image, with the tools
9+
required for the Emscripten CI build. The image is hosted at
10+
[Docker Hub](https://hub.docker.com/r/emscripten/emscripten-ci) and used
11+
by the [CircleCI Emscripten Project](https://circleci.com/gh/emscripten-core/emscripten).
1212

13-
The following sections describe the important parts of the [Dockerfile](./Dockerfile).
13+
The following sections describe the important parts of the [Dockerfile](./Dockerfile).
1414
### Base Image
15-
The `FROM` instruction sets the base image for the final Docker image. Also, all subsequent instructions are executed using this base image.
15+
The `FROM` instruction sets the base image for the final Docker image. Also, all subsequent instructions are executed using this base image.
1616

17-
See [FROM](https://docs.docker.com/engine/reference/builder/#from) (Docker Reference).
17+
See [FROM](https://docs.docker.com/engine/reference/builder/#from) (Docker Reference).
1818

1919
### Package Installation (apt-get)
2020
Additional packages/tools required by the Emscripten CI build are installed via apt-get using the `RUN` instruction.
2121

2222
It is good practice to execute `apt-get update && apt-get install * && apt-get clean cache` using a single `RUN` instruction, as each docker instruction is creating a new read-only layer. Running `apt-get clean` helps keeping the resulting image size low (which would not be the case if `apt-get install` was executed as a separate `RUN` instruction).
2323

24-
It's recommended to sort the package names alphabetically. For better traceability we created separate package sections for build, docs and test packages.
24+
It's recommended to sort the package names alphabetically. For better traceability we created separate package sections for build, docs and test packages.
2525

26-
See [best practices for writing Dockerfiles](https://docs.docker.com/develop/develop-images/dockerfile_best-practices/).
26+
See [best practices for writing Dockerfiles](https://docs.docker.com/develop/develop-images/dockerfile_best-practices/).
2727

28-
### Package Installation (pip)
28+
### Package Installation (pip)
2929

30-
Pip packages required by the Emscripten CI build are installed in a similar manner as described in the previous section. For example, the `--no-cache-dir` parameter is used in order to keep the size of the final image low.
30+
Pip packages required by the Emscripten CI build are installed in a similar manner as described in the previous section. For example, the `--no-cache-dir` parameter is used in order to keep the size of the final image low.
3131

3232
### Building the image and pushing it to Docker Hub
3333

3434
Use the following commands for updating the `emscripten-ci` pre-built Docker image:
3535

36-
:warning: Write access to the [Docker Hub repository](https://hub.docker.com/r/emscripten/emscripten-ci) is required.
36+
:warning: Write access to the [Docker Hub repository](https://hub.docker.com/r/emscripten/emscripten-ci) is required.
3737

3838
1. Clone/pull the latest version of this repository
3939

4040
1. Build docker image locally from the repository root (location of [Dockerfile](/Dockerfile)):
41-
42-
`docker build . --tag emscripten/emscripten-ci`
43-
41+
42+
`docker build . --tag emscripten/emscripten-ci`
43+
4444
1. Login to your Docker Hub account (if not logged in already):
4545

4646
`docker login`
47-
47+
4848
1. Push docker image to Docker Hub:
49-
49+
5050
`docker push emscripten/emscripten-ci`
51-
52-
See [Docker CLI reference](https://docs.docker.com/engine/reference/commandline/cli/) for further details.
51+
52+
See [Docker CLI reference](https://docs.docker.com/engine/reference/commandline/cli/) for further details.

0 commit comments

Comments
 (0)