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.

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

Update components #645

Merged
merged 1 commit into from
Jan 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions .config/molecule/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ platforms:
image: jrei/systemd-debian:buster
dockerfile: ../Dockerfile.debian.buster.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
- /sys/fs/cgroup:/sys/fs/cgroup:rw
tmpfs:
- /tmp
override_command: false
Expand All @@ -19,8 +20,9 @@ platforms:
image: jrei/systemd-debian:bullseye
dockerfile: ../Dockerfile.debian.bullseye.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
- /sys/fs/cgroup:/sys/fs/cgroup:rw
tmpfs:
- /tmp
override_command: false
Expand Down
11 changes: 6 additions & 5 deletions .manala.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ system:
- .env
docker: true
ansible:
version: 2.14.0
version: 2.14.1
ansible-lint:
version: 6.9.0
version: 6.10.2
molecule:
version: 4.0.3
docker:
version: 2.0.0
version: 4.0.4
plugins:
version: 22.0.0
docker: true
12 changes: 7 additions & 5 deletions .manala/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ FROM debian:${DEBIAN}-slim as base
ARG DEBIAN
ARG USER_ID=1000
ARG GROUP_ID=1000
ARG GOSU_VERSION=1.14
ARG GOSU_VERSION=1.16
ARG GOMPLATE_VERSION=3.11.3

# The 'container' environment variable tells systemd that it's running inside a
Expand All @@ -29,6 +29,7 @@ RUN \
gnupg \
libarchive-tools bzip2 \
bash-completion \
rsync \
git \
make \
less \
Expand Down Expand Up @@ -82,7 +83,7 @@ RUN \

# Ansible
RUN \
pip3 install ansible-core==2.14.0
pip3 install ansible-core==2.14.1

RUN \
BUILD_PACKAGES="pipx python3-dev gcc" \
Expand All @@ -91,10 +92,11 @@ RUN \
&& apt-get install --yes --no-install-recommends \
${BUILD_PACKAGES} \
# Ansible Lint
&& pipx install ansible-lint==6.9.0 \
&& pipx install ansible-lint==6.10.2 \
# Molecule
&& pipx install molecule==4.0.3 \
&& pipx install molecule==4.0.4 \
&& _MOLECULE_COMPLETE=bash_source molecule > /etc/bash_completion.d/molecule \
&& pipx inject molecule molecule-docker==2.0.0 \
&& pipx inject molecule molecule-plugins==22.0.0 \
&& pipx inject molecule molecule-plugins[docker]==22.0.0 \
&& apt-get purge --yes --autoremove ${BUILD_PACKAGES}

2 changes: 1 addition & 1 deletion .manala/docker/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
build:
context: .
target: system
image: manala-ansible-roles:20221125100030
image: manala-ansible-roles:20230108151151
volumes:
- ../..:${DIR}
environment:
Expand Down
11 changes: 9 additions & 2 deletions .manala/make/text.mk
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ COLOR_COMMENT := \033[36m

# Usage:
# $(call message, Foo$(,) bar) = Foo, bar
# $(call message, Foo$(rp) bar) = Foo) bar

, := ,
rp := )

########
# Time #
Expand Down Expand Up @@ -81,11 +83,16 @@ endef

# Usage:
# $(call confirm, Foo bar) = ༼ つ ◕_◕ ༽つ Foo bar (y/N):
# $(call confirm, Bar foo, y) = ༼ つ ◕_◕ ༽つ Foo bar (Y/n):

define confirm
$(if $(CONFIRM),, \
printf "$(COLOR_INFO) ༼ つ ◕_◕ ༽つ $(COLOR_WARNING)$(strip $(1)) $(COLOR_RESET)$(COLOR_WARNING)(y/N)$(COLOR_RESET): "; \
read CONFIRM ; if [ "$$CONFIRM" != "y" ]; then printf "\n"; exit 1; fi; \
printf "$(COLOR_INFO) ༼ つ ◕_◕ ༽つ $(COLOR_WARNING)$(strip $(1)) $(COLOR_RESET)$(COLOR_WARNING)$(if $(filter y,$(2)),(Y/n),(y/N))$(COLOR_RESET): " ; \
read CONFIRM ; \
case $$CONFIRM in $(if $(filter y,$(2)), \
[nN]$(rp) printf "\n" ; exit 1 ;; *$(rp) ;;, \
[yY]$(rp) ;; *$(rp) printf "\n" ; exit 1 ;; \
) esac \
)
endef

Expand Down
8 changes: 4 additions & 4 deletions .manala/templates/profile.d/message.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ printf "\033[34m =-=-_-__=_-= _=_=-=_,-'\033[32m|\033[34m\"'\"\"-\033[32m|\033[3
printf "\033[34m =- _=-=- -_=-=_,-\" \033[32m|\033[34m\"\033[0m\n"
printf "\033[34m =- =- -=.--\"\033[0m\n"
printf "\n"
printf " \033[36m‣ ansible \033[35m2.14.0\033[0m\n"
printf " \033[36m‣ ansible-lint \033[35m6.9.0\033[0m\n"
printf " \033[36m‣ molecule \033[35m4.0.3\033[0m\n"
printf " \033[36m‣ molecule-docker \033[35m2.0.0\033[0m\n"
printf " \033[36m‣ ansible \033[35m2.14.1\033[0m\n"
printf " \033[36m‣ ansible-lint \033[35m6.10.2\033[0m\n"
printf " \033[36m‣ molecule \033[35m4.0.4\033[0m\n"
printf " \033[36m‣ molecule-plugins \033[35m22.0.0\033[0m\n"