mirror of https://github.com/aminya/setup-cpp
docker: use ubuntu 22.04 instead of unreleased kinetic
This commit is contained in:
parent
511e67561a
commit
455c907aa0
|
@ -89,7 +89,7 @@ jobs:
|
||||||
- ubuntu-20.04
|
- ubuntu-20.04
|
||||||
container:
|
container:
|
||||||
- "ubuntu_node.dockerfile"
|
- "ubuntu_node.dockerfile"
|
||||||
- "ubuntu_stable_node.dockerfile"
|
- "ubuntu_20.04_node.dockerfile"
|
||||||
node:
|
node:
|
||||||
- 14
|
- 14
|
||||||
pnpm:
|
pnpm:
|
||||||
|
|
|
@ -180,7 +180,7 @@ Here is an example for using setup_cpp to make a builder image that has the Cpp
|
||||||
|
|
||||||
```dockerfile
|
```dockerfile
|
||||||
#### Base Image
|
#### Base Image
|
||||||
FROM ubuntu:devel AS base
|
FROM ubuntu:22.04 AS base
|
||||||
|
|
||||||
# add setup_cpp
|
# add setup_cpp
|
||||||
WORKDIR "/"
|
WORKDIR "/"
|
||||||
|
@ -203,7 +203,7 @@ RUN bash -c 'source ~/.cpprc \
|
||||||
&& make build'
|
&& make build'
|
||||||
|
|
||||||
### Running environment
|
### Running environment
|
||||||
# use a distroless image or ubuntu:devel if you wish
|
# use a distroless image or ubuntu:22.04 if you wish
|
||||||
FROM gcr.io/distroless/cc
|
FROM gcr.io/distroless/cc
|
||||||
# copy the built binaries and their runtime dependencies
|
# copy the built binaries and their runtime dependencies
|
||||||
COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
|
COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
|
||||||
|
@ -258,7 +258,7 @@ The following gives an example for setting up a C++ environment inside GitLab pi
|
||||||
.gitlab-ci.yaml
|
.gitlab-ci.yaml
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
image: ubuntu:devel
|
image: ubuntu:22.04
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- test
|
- test
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#### Base Image
|
#### Base Image
|
||||||
FROM ubuntu:devel AS base
|
FROM ubuntu:22.04 AS base
|
||||||
|
|
||||||
# add setup_cpp
|
# add setup_cpp
|
||||||
WORKDIR "/"
|
WORKDIR "/"
|
||||||
|
@ -22,7 +22,7 @@ RUN bash -c 'source ~/.cpprc \
|
||||||
&& make build'
|
&& make build'
|
||||||
|
|
||||||
### Running environment
|
### Running environment
|
||||||
# use a distroless image or ubuntu:devel if you wish
|
# use a distroless image or ubuntu:22.04 if you wish
|
||||||
FROM gcr.io/distroless/cc
|
FROM gcr.io/distroless/cc
|
||||||
# copy the built binaries and their runtime dependencies
|
# copy the built binaries and their runtime dependencies
|
||||||
COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
|
COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ubuntu:devel AS base
|
FROM ubuntu:22.04 AS base
|
||||||
|
|
||||||
RUN apt-get update -qq
|
RUN apt-get update -qq
|
||||||
RUN apt-get install -y --no-install-recommends nodejs
|
RUN apt-get install -y --no-install-recommends nodejs
|
||||||
|
@ -21,7 +21,7 @@ RUN bash -c 'source ~/.cpprc \
|
||||||
&& make build'
|
&& make build'
|
||||||
|
|
||||||
### Running environment
|
### Running environment
|
||||||
# use a distroless image or ubuntu:devel if you wish
|
# use a distroless image or ubuntu:22.04 if you wish
|
||||||
FROM gcr.io/distroless/cc
|
FROM gcr.io/distroless/cc
|
||||||
# copy the built binaries and their runtime dependencies
|
# copy the built binaries and their runtime dependencies
|
||||||
COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
|
COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
|
||||||
|
|
Loading…
Reference in New Issue