Skip to content

Commit 3b9c722

Browse files
committed
Fix new debian-9 packages
1 parent 7ed82b2 commit 3b9c722

File tree

3 files changed

+29
-2
lines changed

3 files changed

+29
-2
lines changed

docker/base-app/debian-9/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ COPY conf/ /opt/docker/
2222
RUN /usr/local/bin/apt-install \
2323
# Install services
2424
openssh-server \
25-
mysql-client \
25+
mariadb-client \
2626
sqlite \
2727
dnsmasq \
2828
postfix \

docker/base-app/debian-9/Dockerfile.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
{{ docker.copy('conf/', '/opt/docker/') }}
88

9-
{{ baseapp.debian() }}
9+
{{ baseapp.debian9() }}

template/Dockerfile/images/baseapp.jinja2

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,33 @@ RUN /usr/local/bin/apt-install \
8585
{{ provision.runRoleInline('base-app', role) }}
8686
{%- endmacro %}
8787

88+
{% macro debian9(role='') -%}
89+
# Install services
90+
RUN /usr/local/bin/apt-install \
91+
# Install services
92+
openssh-server \
93+
mariadb-client \
94+
sqlite \
95+
dnsmasq \
96+
postfix \
97+
# Install common tools
98+
sudo \
99+
zip \
100+
unzip \
101+
bzip2 \
102+
wget \
103+
curl \
104+
net-tools \
105+
moreutils \
106+
dnsutils \
107+
openssh-client \
108+
rsync \
109+
git \
110+
nano \
111+
vim \
112+
&& /usr/local/bin/generate-locales \
113+
{{ provision.runRoleInline('base-app', role) }}
114+
{%- endmacro %}
88115

89116
{% macro ubuntu(role='') -%}
90117
# Install services

0 commit comments

Comments
 (0)