Skip to content

Commit

Permalink
Merge branch 'release/12.2.0-4alvistack9'
Browse files Browse the repository at this point in the history
  • Loading branch information
hswong3i committed Apr 11, 2020
2 parents 3f00188 + 92f3a21 commit fca71e7
Show file tree
Hide file tree
Showing 15 changed files with 145 additions and 9 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

### Major Changes

## 12.2.0-4alvistack8 - 2020-04-11
## 12.2.0-4alvistack9 - 2020-04-11

### Major Changes

- Debug build
- Provision with systemd support

## 12.2.0-4alvistack4 - 2020-03-05

Expand Down
8 changes: 8 additions & 0 deletions molecule/10/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@ driver:
platforms:
- name: ${MOLECULE_INSTANCE_NAME}-1
dockerfile: Dockerfile.j2
privileged: true
volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
entrypoint: init
command: "bash -c 'sleep infinity'"
tty: true
env:
container: docker
lint: |
set -ex
yamllint .
Expand Down
8 changes: 8 additions & 0 deletions molecule/11/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@ driver:
platforms:
- name: ${MOLECULE_INSTANCE_NAME}-1
dockerfile: Dockerfile.j2
privileged: true
volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
entrypoint: init
command: "bash -c 'sleep infinity'"
tty: true
env:
container: docker
lint: |
set -ex
yamllint .
Expand Down
8 changes: 8 additions & 0 deletions molecule/12/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@ driver:
platforms:
- name: ${MOLECULE_INSTANCE_NAME}-1
dockerfile: Dockerfile.j2
privileged: true
volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
entrypoint: init
command: "bash -c 'sleep infinity'"
tty: true
env:
container: docker
lint: |
set -ex
yamllint .
Expand Down
41 changes: 41 additions & 0 deletions molecule/default/Dockerfile.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# (c) Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ubuntu:18.04

ENV LANG "en_US.utf8"
ENV LC_ALL "en_US.utf8"
ENV SHELL "/bin/bash"
ENV TZ "UTC"

# Hotfix for systemd
RUN set -ex \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y systemd \
&& ln -fs /lib/systemd/systemd /usr/sbin/init \
&& find /lib/systemd/system/sysinit.target.wants/ -name "systemd-tmpfiles-setup.service" -delete \
&& rm -f /lib/systemd/system/multi-user.target.wants/* \
&& rm -f /etc/systemd/system/*.wants/* \
&& rm -f /lib/systemd/system/local-fs.target.wants/* \
&& rm -f /lib/systemd/system/sockets.target.wants/*udev* \
&& rm -f /lib/systemd/system/sockets.target.wants/*initctl* \
&& rm -f /lib/systemd/system/basic.target.wants/* \
&& rm -rf /var/lib/apt/lists/*

# Hotfix for en_US.utf8 locale
RUN set -ex \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y locales \
&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \
&& rm -rf /var/lib/apt/lists/*
1 change: 1 addition & 0 deletions molecule/default/group_vars/all/00-defaults.yml
15 changes: 15 additions & 0 deletions molecule/default/group_vars/all/99-molecule.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---

# (c) Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
55 changes: 55 additions & 0 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
---

# (c) Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

driver:
name: docker
platforms:
- name: ${MOLECULE_INSTANCE_NAME}-1
dockerfile: Dockerfile.j2
privileged: true
volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
entrypoint: init
command: "bash -c 'sleep infinity'"
tty: true
env:
container: docker
lint: |
set -ex
yamllint .
ansible-lint
flake8
dependency:
name: galaxy
options:
role-file: ansible-role-requirements.yml
roles-path: ${ANSIBLE_ROLES_PATH}
ignore-errors: true
provisioner:
name: ansible
env:
ANSIBLE_ROLES_PATH: ${ANSIBLE_ROLES_PATH}
config_options:
defaults:
forks: 20
ssh_connection:
pipelining: true
ssh_args: -o ControlMaster=auto -o ControlPersist=600s
inventory:
links:
group_vars: group_vars
verifier:
name: ansible
2 changes: 1 addition & 1 deletion roles/bootstrap
2 changes: 1 addition & 1 deletion roles/gosu
2 changes: 1 addition & 1 deletion roles/locales
2 changes: 1 addition & 1 deletion roles/postgres
2 changes: 1 addition & 1 deletion roles/python
2 changes: 1 addition & 1 deletion roles/timezone
2 changes: 1 addition & 1 deletion roles/tini
Submodule tini updated from 09383d to 49103e

0 comments on commit fca71e7

Please sign in to comment.