diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile index 236ca05e91..3e9a77b946 100644 --- a/src/docker/Dockerfile +++ b/src/docker/Dockerfile @@ -1,28 +1,29 @@ -FROM hhyo/archery-base:sha-b3a08ef - -WORKDIR /opt/archery - -ADD http://mirrors.ustc.edu.cn/epel/RPM-GPG-KEY-EPEL-7 /etc/pki/rpm-gpg/ +ARG BASE_IMAGE="hhyo/archery-base:sha-1e06868" +FROM ${BASE_IMAGE} +SHELL ["/bin/bash", "-c"] COPY . /opt/archery/ +WORKDIR /opt/ + +RUN useradd nginx #archery -RUN cd /opt \ - && yum -y install nginx \ - && source /opt/venv4archery/bin/activate \ - && pip3 install -r /opt/archery/requirements.txt \ - && pip3 install "redis>=4.1.0" \ +RUN apt-get install -yq --no-install-recommends nginx \ + && source venv4archery/bin/activate \ + && pip install -r /opt/archery/requirements.txt \ + && pip install "redis>=4.1.0" \ && cp -f /opt/archery/src/docker/nginx.conf /etc/nginx/ \ && cp -f /opt/archery/src/docker/supervisord.conf /etc/ \ && mv /opt/sqladvisor /opt/archery/src/plugins/ \ && mv /opt/soar /opt/archery/src/plugins/ \ && mv /opt/my2sql /opt/archery/src/plugins/ \ - && yum clean all \ - && rm -rf /var/cache/yum/* \ - && rm -rf ~/.cache + && apt-get -yq remove gcc curl \ + && apt-get clean \ + && rm -rf /var/cache/apt/* \ + && rm -rf /root/.cache #port EXPOSE 9123 #start service -ENTRYPOINT bash /opt/archery/src/docker/startup.sh && bash +ENTRYPOINT ["bash", "/opt/archery/src/docker/startup.sh"]