Skip to content

Commit 43cff6e

Browse files
committed
test: use ubuntu in docker images
1 parent 76832b8 commit 43cff6e

File tree

5 files changed

+9
-23
lines changed

5 files changed

+9
-23
lines changed

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,7 @@ jobs:
178178
Here is an example for using setup_cpp to make a builder image that has the Cpp tools you need.
179179

180180
```dockerfile
181-
# debian
182-
FROM debian:bullseye
181+
FROM ubuntu:devel
183182

184183
# add setup_cpp
185184
WORKDIR "/"
@@ -202,7 +201,7 @@ See [this folder](https://github.com/aminya/setup-cpp/tree/master/building/docke
202201
If you want to build the ones included, then run:
203202

204203
```ps1
205-
docker build -f ./building/docker/debian.dockerfile -t setup_cpp .
204+
docker build -f ./building/docker/ubuntu.dockerfile -t setup_cpp .
206205
```
207206

208207
Where you should use the path to the dockerfile after `-f`.
@@ -242,7 +241,7 @@ The following gives an example for setting up a C++ environment inside GitLab pi
242241
.gitlab-ci.yaml
243242
244243
```yaml
245-
image: ubuntu:latest
244+
image: ubuntu:devel
246245

247246
stages:
248247
- test

building/docker/debian_node_slim.dockerfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

building/docker/debian.dockerfile renamed to building/docker/ubuntu.dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# debian
2-
FROM debian:bullseye
1+
FROM ubuntu:devel
32

43
# add setup_cpp
54
WORKDIR "/"

building/docker/debian_node.dockerfile renamed to building/docker/ubuntu_node.dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
# debian with node installed
2-
FROM node:16
1+
FROM ubuntu:devel
2+
3+
RUN apt-get update -qq
4+
RUN apt-get install -y --no-install-recommends nodejs
35

46
# add setup_cpp.js
57
ADD "./dist/" "/"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"scripts": {
1515
"build": "cross-env NODE_ENV=production parcel build --detailed-report && npm run copy.matchers",
16-
"build.docker": "pnpm build && docker build -f ./building/docker/debian_node.dockerfile -t setup_cpp .",
16+
"build.docker": "pnpm build && docker build -f ./building/docker/ubuntu_node.dockerfile -t setup_cpp .",
1717
"bump": "ncu -u -x execa",
1818
"clean": "shx rm -rf .parcel-cache dist exe",
1919
"copy.matchers": "shx cp ./src/gcc/gcc_matcher.json ./dist/ && shx cp ./src/msvc/msvc_matcher.json ./dist && shx cp ./src/python/python_matcher.json ./dist/ && shx cp ./src/llvm/llvm_matcher.json ./dist/ ",

0 commit comments

Comments
 (0)