Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #22913: add label to ncf docker images #1401

Merged
merged 1 commit into from
Jun 20, 2023
Merged

Fixes #22913: add label to ncf docker images #1401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ci/methods.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
ARG OS=ubuntu:20.04
FROM ${OS}
LABEL ci=ncf/ci/methods.Dockerfile

RUN if type apt-get; then apt-get update && apt-get install -y wget gnupg2 make python3-jinja2 fakeroot acl git; fi
RUN if type yum; then yum install -y wget gnupg2 make python3-jinja2 acl git; fi
RUN if type apt-get; then apt-get update && apt-get install -y wget gnupg2 make python3-jinja2 fakeroot acl git; fi ;\
if type yum; then yum install -y wget gnupg2 make python3-jinja2 acl git; fi

# Accept all OSes
# comment to see it runs again
Expand Down
8 changes: 4 additions & 4 deletions ci/python.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM debian:11
LABEL ci=ncf/ci/python.Dockerfile

ARG USER_ID=1000
COPY ci/user.sh .
RUN ./user.sh $USER_ID

RUN apt-get update && apt-get install -y git wget gnupg2 make python3-pip
RUN pip3 install avocado-framework pylint Jinja2
RUN ./user.sh $USER_ID ;\
apt-get update && apt-get install -y git wget gnupg2 make python3-pip ;\
pip3 install avocado-framework pylint Jinja2

# Accept all OSes
ENV UNSUPPORTED=y
Expand Down
1 change: 1 addition & 0 deletions ci/typos.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM rust
LABEL ci=ncf/ci/typos.Dockerfile
ARG VERSION

RUN cargo install -f typos-cli --version =$VERSION