Commit 8e044762 authored by nimrod's avatar nimrod
Browse files

Added the httpd image.

parent 28cac3fa

.gitlab-ci.yml

+19 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ stages: 
variables:

  TAG: latest



# Job templates:



.build:

  stage: build

  variables:
@@ -42,6 +44,8 @@ variables: 
    - docker push "registry.shore.co.il/$IMAGE:$TAG"

  rules: *rules



# cgit image:



build-cgit:

  extends: .build

  variables:
@@ -54,3 +58,18 @@ push-cgit: 
  needs:

    - job: build-cgit

      artifacts: true



# httpd image:



build-httpd:

  extends: .build

  variables:

    IMAGE: httpd



push-httpd:

  extends: .push

  variables:

    IMAGE: httpd

  needs:

    - job: build-httpd

      artifacts: true

httpd/.dockerignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
*

httpd/Dockerfile

0 → 100644
+28 −0
Original line number Diff line number Diff line 
FROM registry.hub.docker.com/library/debian:buster-slim

# hadolint ignore=DL3008,DL3015

RUN apt-get update && \

    DEBIAN_FRONTEND=noninteractive apt-get install -y \

        apache2 \

        libcap2-bin \

        wget \

    && \

    setcap CAP_NET_BIND_SERVICE=+ep /usr/sbin/apache2 && \

    DEBIAN_FRONTEND=noninteractive apt-get purge --auto-remove -y libcap2-bin && \

    a2enmod status && \

    install -d -o www-data -g www-data -m 755 /run/apache2 && \

    install -d -o www-data -g www-data -m 755 /var/log/apache2 && \

    ln -sf /dev/stdout /var/log/apache2/access.log && \

    ln -sf /dev/stderr /var/log/apache2/error.log && \

    ln -sf /dev/stdout /var/log/apache2/other_vhosts_access.log && \

    rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/*

ENV APACHE_RUN_DIR=/run/apache2 \

    APACHE_LOG_DIR=/var/log/apache2 \

    APACHE_RUN_USER=www-data \

    APACHE_RUN_GROUP=www-data \

    APACHE_PID_FILE=/run/apache2/apache2.pid

RUN apache2 -t

EXPOSE 80

CMD [ "apache2", "-DFOREGROUND" ]

USER "www-data"

WORKDIR /var/www

HEALTHCHECK CMD wget --spider --quiet http://localhost/server-status --user-agent 'Healthcheck' || exit 1