Skip to content

Remove docker from the image #1

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.

Sign up for GitHub

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

Open
JanMikes wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove docker from the image #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd8bd33
Remove docker from image
JanMikes Jul 1, 2022
ef36f6d
Tweaks of unit
JanMikes Jul 1, 2022
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
26 changes: 9 additions & 17 deletions php/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ COPY wait-for-it.sh /usr/local/bin/wait-for-it
COPY php.ini /usr/local/etc/php/conf.d/99-php-overrides.ini

COPY --from=UNIT_BUILDER /usr/sbin/unitd /usr/sbin/unitd
COPY --from=UNIT_BUILDER /usr/sbin/unitd-debug /usr/sbin/unitd-debug
COPY --from=UNIT_BUILDER /usr/lib/unit/ /usr/lib/unit/
COPY --from=UNIT_BUILDER /requirements.apt /requirements.apt

Expand All @@ -64,19 +63,19 @@ COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr
RUN chmod +x /usr/local/bin/wait-for-it \
&& chmod +x /usr/local/bin/docker-entrypoint.sh \
&& mkdir /docker-entrypoint.d/ \
&& groupadd -g 998 docker \
&& useradd -u 1000 peon \
&& usermod -aG docker peon \
&& groupadd --gid 1000 peon \
&& useradd --uid 1000 --gid 1000 --no-create-home peon \
&& mkdir /.composer \
&& chown peon /.composer \
&& chown peon:peon /.composer \
&& mkdir /usr/tmp \
&& apt-get update && apt-get install -y \
&& apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \
git \
zip \
ca-certificates \
curl \
gnupg \
lsb-release \
$(cat /requirements.apt) \
&& install-php-extensions \
intl \
zip \
Expand All @@ -85,19 +84,12 @@ RUN chmod +x /usr/local/bin/wait-for-it \
opcache \
apcu \
xdebug \
&& curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \
&& echo \
"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \
$(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \
&& mkdir -p /var/lib/unit/state \
&& chown peon -R /var/lib/unit \
&& chown peon -R /usr/tmp \
&& chown peon -R /usr/local/etc/php/conf.d \
&& apt-get update && apt-get -y install \
docker-ce-cli \
&& apt-get --no-install-recommends --no-install-suggests -y install curl $(cat /requirements.apt) \
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
&& rm -f /requirements.apt \
&& mkdir -p /var/lib/unit/state \
&& chown peon:peon -R /var/lib/unit \
&& chown peon:peon -R /usr/tmp \
&& chown peon:peon -R /usr/local/etc/php/conf.d \
&& ln -sf /dev/stdout /var/lib/unit/unit.log \
&& ln -sf /dev/stdout /var/lib/unit/access.log

Expand Down
2 changes: 1 addition & 1 deletion php/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ curl_put()
return 0
}

if [ "$1" = "unitd" -o "$1" = "unitd-debug" ]; then
if [ "$1" = "unitd" ]; then
if /usr/bin/find "/docker-entrypoint.d/" -mindepth 1 -print -quit 2>/dev/null | /bin/grep -q .; then
echo "$0: /docker-entrypoint.d/ is not empty, launching Unit daemon to perform initial configuration..."
/usr/sbin/$1 --control unix:/var/lib/unit/unit.sock
Expand Down