Skip to content

Commit ecc733b

Browse files
committed
fix: Dockerfile
1 parent d98fc69 commit ecc733b

1 file changed

Lines changed: 15 additions & 8 deletions

File tree

docker_for_build/Dockerfile

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,22 @@ LABEL Description="MEICAN Image" \
66
ARG MEICAN_VERSION=v3.2.0
77

88
ENV DEBIAN_FRONTEND=noninteractive \
9-
DEBCONF_NONINTERACTIVE_SEEN=true
9+
DEBCONF_NONINTERACTIVE_SEEN=true
1010

1111
ENV MYSQL_DATABASE=$MYSQL_DATABASE \
12-
MYSQL_USER=$MYSQL_USER \
13-
MYSQL_PASSWORD=$MYSQL_PASSWORD \
14-
MEICAN_DIR=/home/meican/meican-$MEICAN_VERSION
15-
12+
MYSQL_USER=$MYSQL_USER \
13+
MYSQL_PASSWORD=$MYSQL_PASSWORD \
14+
MEICAN_DIR=/home/meican/meican-$MEICAN_VERSION
15+
1616
RUN apt-get update \
1717
&& apt-get install -yq --no-install-recommends \
1818
apt-utils \
19+
ca-certificates \
1920
curl \
2021
sudo \
2122
zip \
2223
unzip \
24+
git \
2325
# Install apache
2426
apache2 \
2527
# Install php 7.0
@@ -30,16 +32,20 @@ RUN apt-get update \
3032
php7.0-soap \
3133
php7.0-xml \
3234
libapache2-mod-php \
35+
&& update-ca-certificates \
3336
&& rm -rf /var/lib/apt/lists/*
3437

3538
RUN adduser --disabled-password --gecos '' meican \
3639
&& usermod -aG sudo meican \
37-
&& su meican -c "set -euo pipefail; curl -fsSL https://github.com/ufrgs-hyman/meican/archive/refs/tags/${MEICAN_VERSION}.tar.gz | tar xzC /home/meican"
40+
&& curl -fsSL -o /tmp/meican.tgz "https://github.com/ufrgs-hyman/meican/archive/refs/tags/${MEICAN_VERSION}.tar.gz" \
41+
&& tar -xzf /tmp/meican.tgz -C /home/meican \
42+
&& chown -R meican:meican /home/meican \
43+
&& rm -f /tmp/meican.tgz
3844

3945
WORKDIR $MEICAN_DIR
4046

4147
RUN su meican -c "curl -kO https://getcomposer.org/download/1.9.3/composer.phar" \
42-
&& su meican -c "php composer.phar global require "fxp/composer-asset-plugin:~1.4.4"" \
48+
&& su meican -c "php composer.phar global require \"fxp/composer-asset-plugin:~1.4.4\"" \
4349
&& ln -s $MEICAN_DIR/web /var/www/meican \
4450
&& a2enmod rewrite
4551

@@ -51,7 +57,8 @@ CMD cp $MEICAN_DIR/docker_for_build/db.php $MEICAN_DIR/config/ \
5157
&& sed -i "s/MYSQL_DATABASE/$MYSQL_DATABASE/" $MEICAN_DIR/config/db.php \
5258
&& sed -i "s/MYSQL_USER/$MYSQL_USER/" $MEICAN_DIR/config/db.php \
5359
&& sed -i "s/MYSQL_PASSWORD/$MYSQL_PASSWORD/" $MEICAN_DIR/config/db.php \
54-
&& chown meican:meican $MEICAN_DIR/config/db.php \
60+
&& chown meican:meican $MEICAN_DIR/config/db.php \
5561
&& su meican -c "php composer.phar install" \
5662
&& service apache2 start \
5763
&& /bin/bash
64+

0 commit comments

Comments
 (0)