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

Feature/sifo580 Adding Podman to be used for registry access #15

Merged
merged 14 commits into from
Mar 4, 2021
Merged

Feature/sifo580 Adding Podman to be used for registry access #15

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
96a915b
update for podman
Mar 1, 2021
b3af826
test readme
Mar 1, 2021
31719cb
Update README.md
spfrancis Mar 2, 2021
02eccb4
update for comeents from review
Mar 2, 2021
2116e0e
Merge branch 'feature/sifo580Podman' of https://github.com/saic-oss/a…
Mar 2, 2021
ef46e59
update for syntax error on dnf -command
Mar 2, 2021
2c0f8a0
update for Dockerfile
Mar 2, 2021
97c2643
update for comments from MR
Mar 2, 2021
ae42cf5
switched to podman 2.2
Mar 3, 2021
e848d39
update to move podman section in dockerfile
Mar 3, 2021
8f9a933
put container-selinux back in
Mar 4, 2021
1096acf
cleanup and add podman_spec
Mar 4, 2021
0f06d55
Merge branch 'main' into feature/sifo580Podman
saic-statonb Mar 4, 2021
63c425b
clearing extra space.
Mar 4, 2021
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
13 changes: 13 additions & 0 deletions spec/podman_spec.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/usr/bin/env shellspec

Describe "printVersion()"
printVersion() {
podman --version | grep "${PODMAN_VERSION}"
}

It "validates tool is installed by checking version"
When call printVersion
The output should include "${PODMAN_VERSION}"
The status should eq 0
End
End
13 changes: 12 additions & 1 deletion src/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ ENV DOCKER_VERION=${DOCKER_VERSION}
# base packages, so that we always get the latest version. These packages are very stable and
# shouldn't ever need version pinning
# Please keep the list alphabetized for maintainability
RUN dnf install -y \

RUN dnf install -y --refresh \
bind-utils \
bzip2 \
bzip2-devel \
Expand All @@ -37,6 +38,7 @@ RUN dnf install -y \
gettext \
git \
jq \
iptables \
libffi-devel \
libxslt-devel \
make \
Expand Down Expand Up @@ -119,13 +121,22 @@ RUN wget -O /usr/local/bin/gomplate "https://github.com/hairyhenderson/gomplate/
&& chmod +x /usr/local/bin/gomplate \
&& rm -rf /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???*


spfrancis marked this conversation as resolved.
Show resolved Hide resolved
# Install docker-compose. Get versions from https://github.com/docker/compose/releases
ARG DOCKER_COMPOSE_VERSION="1.26.2"
ENV DOCKER_COMPOSE_VERSION=${DOCKER_COMPOSE_VERSION}
RUN wget -O /usr/local/bin/docker-compose "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64" \
&& chmod +x /usr/local/bin/docker-compose \
&& rm -rf /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???*

# Install Podman. Get available versions by running the command `dnf list podman`
ARG PODMAN_VERSION="2.2.1"
ENV PODMAN_VERSION=${PODMAN_VERSION}
RUN dnf -y install podman-${PODMAN_VERSION} \
&& dnf clean all \
&& rm -rf /var/cache/yum/ \
&& rm -rf /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???*

RUN useradd -ms /bin/bash anvil

USER anvil
Expand Down