Skip to content

Add ansible verbose pr 1.x #174

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

Merged
merged 7 commits into from
Jan 29, 2024
Merged

Add ansible verbose pr 1.x #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
12f6a32
Merging 1.x.
gregharvey Jan 29, 2024
b4eb615
Merging 1.x.
gregharvey Jan 29, 2024
c3b2096
Getting rid of bookworm in 1.x because Ansible cannot install on it.
gregharvey Jan 29, 2024
b11bd63
Merge branch '1.x' into add_ansible_verbose-PR-1.x
gregharvey Jan 29, 2024
d0021bf
Merge branch 'add_ansible_verbose' into add_ansible_verbose-PR-1.x
gregharvey Jan 29, 2024
e0f812c
Missing paths to Dockerfile in some CI jobs.
gregharvey Jan 29, 2024
c7d5fb5
Merge branch 'add_ansible_verbose' into add_ansible_verbose-PR-1.x
gregharvey Jan 29, 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 .github/workflows/ce-dev-PR-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ jobs:
rm -Rf mkcert
- name: Build and test
run: |
/bin/sh docker-images/export.sh --version latest --image-name ce-dev
/bin/sh docker-images/export.sh --version latest --image-name ce-dev-controller
/bin/sh docker-images/export.sh --version latest --image-name ce-dev --dockerfile-path base
/bin/sh docker-images/export.sh --version latest --image-name ce-dev-controller --dockerfile-path controller
/bin/sh templates/prebuild.sh
4 changes: 2 additions & 2 deletions .github/workflows/ce-dev-build-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ jobs:
- name: Build and push Docker images
run: |
echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
/bin/sh docker-images/export.sh --version devel --image-name ce-dev --base-image debian:bookworm-slim --dockerfile-path base-devel --push
/bin/sh docker-images/export.sh --version devel --image-name ce-dev-controller --base-image debian:bookworm-slim --dockerfile-path controller-devel --push
/bin/sh docker-images/export.sh --version devel --image-name ce-dev --base-image debian:bullseye-slim --dockerfile-path base-devel --push
/bin/sh docker-images/export.sh --version devel --image-name ce-dev-controller --base-image debian:bullseye-slim --dockerfile-path controller-devel --push
4 changes: 2 additions & 2 deletions .github/workflows/ce-dev-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ jobs:
rm -Rf mkcert
- name: Build and test
run: |
/bin/sh docker-images/export.sh --version latest --image-name ce-dev
/bin/sh docker-images/export.sh --version latest --image-name ce-dev-controller
/bin/sh docker-images/export.sh --version latest --image-name ce-dev --dockerfile-path base
/bin/sh docker-images/export.sh --version latest --image-name ce-dev-controller --dockerfile-path controller
/bin/sh templates/prebuild.sh
6 changes: 3 additions & 3 deletions docker-images/base-devel/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-slim as unison
FROM debian:bullseye-slim as unison
RUN \
set -x && \
export DEBIAN_FRONTEND=noninteractive && \
Expand All @@ -14,7 +14,7 @@ RUN \
cd /tmp/unison-2.53.3 && \
make

FROM debian:bookworm-slim
FROM debian:bullseye-slim

RUN \
set -x && \
Expand Down Expand Up @@ -100,4 +100,4 @@ ENV container docker
STOPSIGNAL SIGRTMIN+3
VOLUME [ "/sys/fs/cgroup", "/run", "/run/lock", "/tmp" ]

ENTRYPOINT ["/sbin/init"]
ENTRYPOINT ["/sbin/init"]