Skip to content

Commit b83d42f

Browse files
authored
Merge branch 'master' into directory-enforcement
2 parents 5e7e3b9 + eda64f6 commit b83d42f

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

docker-images/ansible/galaxy_requirements.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
---
22
collections:
3-
- name: community.general
3+
- name: "community.general"
44
version: "7.0.1"
5-
- name: ansible.windows
5+
- name: "ansible.windows"
66
version: "1.14.0"
7-
- name: ansible.posix
7+
- name: "ansible.posix"
88
version: "1.5.4"
9-
- name: community.windows
9+
- name: "community.windows"
1010
version: "1.13.0"
11-
- name: kubernetes.core
11+
- name: "kubernetes.core"
1212
version: "2.4.0"
13-
- name: community.crypto
13+
- name: "community.crypto"
1414
version: "2.13.1"
15-
- name: community.mysql
15+
- name: "community.mysql"
1616
version: "3.7.1"
17-
- name: openstack.cloud
17+
- name: "openstack.cloud"
1818
version: "2.1.0"
19-
- name: community.postgresql
19+
- name: "community.postgresql"
2020
version: "2.4.1"
21-
- name: community.docker
21+
- name: "community.docker"
2222
version: "3.12.1"
2323
- name: "ansible.netcommon"
2424
version: "5.1.1"

docker-images/ansible/oss/debian/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ RUN DEBIAN_FRONTEND=${DEBIAN_FRONTEND} apt-get -y install \
2121
libffi-dev \
2222
openssh-client \
2323
libssl-dev \
24-
python3.8-dev \
2524
rsync \
2625
util-linux \
2726
&& apt-get clean

docker-images/base/oss/debian/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG DEBIAN_FRONTEND=noninteractive
22

3-
FROM library/debian:stable
3+
FROM library/debian:12
44
LABEL maintainer="[email protected]"
55

66
ENTRYPOINT ["/usr/local/bin/concord_venv/bin/dumb-init", "--"]

0 commit comments

Comments
 (0)