fixed drone image

7821f1c2 · 张宇 · 983ac796 · 7821f1c2 · 7821f1c2
Commit 7821f1c2 authored Dec 26, 2019 by 张宇
Show whitespace changes
Inline Side-by-side

Showing with 76 additions and 64 deletions

Dockerfile Dockerfile +11 -64

Dockerfile.bak Dockerfile.bak +65 -0

No files found.
--- a/Dockerfile
+++ b/Dockerfile
-# FROM ccr.ccs.tencentyun.com/gm-base/gm-alpine:v1.3
-FROM alpine:latest
-MAINTAINER Mike [zhangyu@igengmei.com]
-WORKDIR /srv/apps/drone-test/
-COPY ./requirements.txt /tmp
-RUN apk add --no-cache --virtual .build-deps  \
-                bzip2-dev \
-                coreutils \
-                dpkg-dev dpkg \
-                expat-dev \
-                findutils \
-                gcc \
-                gdbm-dev \
-                libc-dev \
-                libffi-dev \
-                libnsl-dev \
-                libressl-dev \
-                libtirpc-dev \
-                linux-headers \
-                make \
-                ncurses-dev \
-                pax-utils \
-                readline-dev \
-                sqlite-dev \
-                tcl-dev \
-                tk \
-                tk-dev \
-                xz-dev \
-                zlib-dev \
-                # 业务相关依赖和安装工具
-                linux-headers \
-                python3-dev \
-                librdkafka-dev \
-                mariadb-client \
-                mariadb-dev \
-                git \
-                openssh \
-                bash \
-                build-base \
-                \
-                # 取消ssh第一次链接的确认
-                && echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config \
-                && apk add --no-cache  mariadb-connector-c-dev libxml2-dev libxslt-dev librdkafka-dev \
-                && apk add --no-cache jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev \
-                \
-                && git clone https://github.com/pyenv/pyenv.git ~/.pyenv \
-                && echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.ashrc \
-                && echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.ashrc \
-                && echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n  eval "$(pyenv init -)"\nfi' >> ~/.ashrc \
-                && source ~/.ashrc \
-                \
-                && git clone https://github.com/pyenv/pyenv-virtualenv.git $(pyenv root)/plugins/pyenv-virtualenv \
-                && echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.ashrc \
-                \
-                && source ~/.ashrc \
-                \
-                && pyenv install 3.8.1 \
-                && pyenv virtualenv 3.8.1 drone-test \
-                && pyenv activate drone-test \
-                \
-                && pip install --no-cache-dir -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/requirements.txt \
-                && mkdir -p /data/log/drone-test/apps
+FROM python:3.8.1-alpine

-COPY . /srv/apps/drone-test/
-WORKDIR /srv/apps/drone-test/
+WORKDIR /app
+
+COPY ./requirements.txt .
+RUN pip install -r requirements.txt
+
+
+COPY . .
+
+CMD echo foo
\ No newline at end of file
--- a/Dockerfile.bak
+++ b/Dockerfile.bak
+# FROM ccr.ccs.tencentyun.com/gm-base/gm-alpine:v1.3
+FROM alpine:latest
+MAINTAINER Mike [zhangyu@igengmei.com]
+WORKDIR /srv/apps/drone-test/
+COPY ./requirements.txt /tmp
+RUN apk add --no-cache --virtual .build-deps  \
+                bzip2-dev \
+                coreutils \
+                dpkg-dev dpkg \
+                expat-dev \
+                findutils \
+                gcc \
+                gdbm-dev \
+                libc-dev \
+                libffi-dev \
+                libnsl-dev \
+                libressl-dev \
+                libtirpc-dev \
+                linux-headers \
+                make \
+                ncurses-dev \
+                pax-utils \
+                readline-dev \
+                sqlite-dev \
+                tcl-dev \
+                tk \
+                tk-dev \
+                xz-dev \
+                zlib-dev \
+                # 业务相关依赖和安装工具
+                linux-headers \
+                python3-dev \
+                librdkafka-dev \
+                mariadb-client \
+                mariadb-dev \
+                git \
+                openssh \
+                bash \
+                build-base \
+                \
+                # 取消ssh第一次链接的确认
+                && echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config \
+                && apk add --no-cache  mariadb-connector-c-dev libxml2-dev libxslt-dev librdkafka-dev \
+                && apk add --no-cache jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev \
+                \
+                && git clone https://github.com/pyenv/pyenv.git ~/.pyenv \
+                && echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.ashrc \
+                && echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.ashrc \
+                && echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n  eval "$(pyenv init -)"\nfi' >> ~/.ashrc \
+                && source ~/.ashrc \
+                \
+                && git clone https://github.com/pyenv/pyenv-virtualenv.git $(pyenv root)/plugins/pyenv-virtualenv \
+                && echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.ashrc \
+                \
+                && source ~/.ashrc \
+                \
+                && pyenv install 3.8.1 \
+                && pyenv virtualenv 3.8.1 drone-test \
+                && pyenv activate drone-test \
+                \
+                && pip install --no-cache-dir -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/requirements.txt \
+                && mkdir -p /data/log/drone-test/apps
+
+COPY . /srv/apps/drone-test/
+WORKDIR /srv/apps/drone-test/