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

Revert alpine #936

Closed
wants to merge 4 commits into from
Closed

Revert alpine #936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b90266
Revert "bump alpine linux to 3.19 (#907)"
aelsabbahy Jun 19, 2024
c371d1e
fix trusty md5 mismatch
aelsabbahy Jun 19, 2024
65660b2
Add some debugging for CI
aelsabbahy Jun 20, 2024
c8b3878
ignore errors when debugging
aelsabbahy Jun 20, 2024
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
4 changes: 2 additions & 2 deletions integration-tests/Dockerfile_alpine3
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM alpine:3.19
FROM alpine:3.12
MAINTAINER Ahmed

# install apache2 and remove un-needed services
RUN apk update && \
apk add --no-cache openrc apache2=2.4.59-r0 bash ca-certificates tinyproxy && \
apk add openrc apache2 bash ca-certificates tinyproxy && \
rc-update add apache2 && \
rc-update add tinyproxy && \
rm -rf /etc/init.d/networking /etc/init.d/hwdrivers /var/cache/apk/* /tmp/*
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/Dockerfile_trusty.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5117819dc7907aa1100e2ff0f2edb68f Dockerfile_trusty
ac8c8df3415c0eecdbedc322480e696e Dockerfile_trusty
2 changes: 1 addition & 1 deletion integration-tests/goss/alpine3/goss-aa-expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package:
apache2:
installed: true
versions:
- 2.4.59-r0
- 2.4.46-r1
service:
apache2:
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/goss/alpine3/goss-expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ package:
apache2:
installed: true
versions:
- 2.4.59-r0
- 2.4.46-r1
foobar:
installed: false
vim-tiny:
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/goss/vars.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
alpine3:
proxy: http://127.0.0.1:8888
packages:
apache2: "2.4.59-r0"
apache2: "2.4.46-r1"
services:
apache2: [sysinit]
arch:
Expand Down
1 change: 1 addition & 0 deletions integration-tests/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ trap "rv=\$?; docker rm -vf $id;docker rm -vf httpbin;docker network rm $network
[[ $os != "arch" ]] && docker_exec "/goss/$os/goss-linux-$arch" -g "/goss/goss-wait.yaml" validate -r 10s -s 100ms && sleep 1

#out=$(docker exec "$container_name" bash -c "time /goss/$os/goss-linux-$arch -g /goss/$os/goss.yaml validate")
docker_exec sh -c "ps -ef;netstat -lntp" || true
out=$(docker_exec "/goss/$os/goss-linux-$arch" --vars "/goss/vars.yaml" --vars-inline "$vars_inline" -g "/goss/$os/goss.yaml" validate)
echo "$out"

Expand Down