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

tests: update Dockerfiles #133

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

tests: update Dockerfiles #133

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
2 changes: 1 addition & 1 deletion tests/05-cqfd_init_custom_image
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ EOF

# Test dockerfile
mkdir -p .cqfd/docker
echo "FROM ubuntu:20.04" > .cqfd/docker/Dockerfile
echo "FROM ubuntu:24.04" > .cqfd/docker/Dockerfile

jtest_prepare "docker registry contains NO image named: $custom_image_1"
if docker inspect "$custom_image_1" &>/dev/null; then
Expand Down
2 changes: 1 addition & 1 deletion tests/05-cqfd_run_c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ test_step1() {
$cqfd run -c --debug >> $test_run_c_file

# at the end of this test, $test_run_c_file is populated
if ! grep -qw "target \`build'" $test_run_c_file; then
if ! grep -qw "target 'build'" $test_run_c_file; then
jtest_log fatal "$test_run_c_file not present after test"
jtest_result fail
rm -f $test_run_c_file
Expand Down
2 changes: 1 addition & 1 deletion tests/05-cqfd_run_c_flavor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jtest_prepare "build cmd for '$flavor' flavor and concatenate with an additional
$cqfd -b $flavor run -c --debug >> $test_run_c_file

# at the end of this test, $test_run_c_file is populated
if ! grep -qw "target \`foo'" $test_run_c_file; then
if ! grep -qw "target 'foo'" $test_run_c_file; then
jtest_log fatal "$test_run_c_file not present after test"
jtest_result fail
rm -f $test_run_c_file
Expand Down
2 changes: 1 addition & 1 deletion tests/05-cqfd_run_su_or_sudo_backend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ $cqfd init && \
################################################################################
# Use another custom Dockerfile with a recent version of su.
################################################################################
echo "FROM ubuntu:20.04" > .cqfd/docker/Dockerfile
echo "FROM ubuntu:24.04" > .cqfd/docker/Dockerfile
echo "ENV CQFD_DEBUG=1" >> .cqfd/docker/Dockerfile

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion tests/test_data/.cqfd/centos/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM centos:centos7
MAINTAINER The CentOS Project <cloud-ops@centos.org>
LABEL org.opencontainers.image.authors="cloud-ops@centos.org"
4 changes: 2 additions & 2 deletions tests/test_data/.cqfd/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:14.04
FROM ubuntu:24.04

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get install -y --no-install-recommends \
make \
Expand Down
4 changes: 2 additions & 2 deletions tests/test_data/.cqfd/docker/Dockerfile.build_context
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:14.04
FROM ubuntu:24.04

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get install -y --no-install-recommends make

Expand Down
4 changes: 2 additions & 2 deletions tests/test_data/.cqfd/docker/Dockerfile.init_extra_env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:14.04
FROM ubuntu:24.04

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get install -y --no-install-recommends make

Expand Down
2 changes: 1 addition & 1 deletion tests/test_data/.cqfd/docker/Dockerfile.missing_dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM alpine:3.8
FROM alpine:3.20

RUN apk update && apk upgrade