Skip to content

Commit

Permalink
chore: reversed alpine changes
Browse files Browse the repository at this point in the history
  • Loading branch information
joamag committed Dec 24, 2024
1 parent 7b0bfac commit 4f0c38e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 19 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/dockerx_alpine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
Expand Down
11 changes: 6 additions & 5 deletions alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
FROM alpine:latest
FROM alpine:3.15

LABEL version="1.0"
LABEL maintainer="Hive Solutions <development@hive.pt>"

ENV PIP_BREAK_SYSTEM_PACKAGES "1"

RUN apk update &&\
apk add bash git ca-certificates python3 &&\
apk add bash git ca-certificates python2 python3 &&\
wget "https://bootstrap.pypa.io/get-pip.py" &&\
wget "https://bootstrap.pypa.io/pip/2.7/get-pip.py" -O get-pip-2.py &&\
python3 get-pip.py &&\
rm get-pip.py
python get-pip-2.py &&\
rm get-pip.py &&\
rm get-pip-2.py

CMD ["/bin/bash"]
15 changes: 1 addition & 14 deletions alpine_dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,7 @@ LABEL maintainer="Hive Solutions <development@hive.pt>"

ENV LD_LIBRARY_PATH "/opt/lib:/usr/local/lib:/usr/lib:/lib"
ENV LIBRARY_PATH "/opt/lib:/usr/local/lib:/usr/lib:/lib"
ENV PYTHON2_VERSION "2.7.18"

RUN apk update && apk add sudo gcc make linux-headers libc-dev openssl-dev python3-dev zlib-dev jpeg-dev &&\
wget https://www.python.org/ftp/python/${PYTHON2_VERSION}/Python-${PYTHON2_VERSION}.tgz &&\
tar -xzf Python-${PYTHON2_VERSION}.tgz &&\
cd Python-${PYTHON2_VERSION} &&\
./configure &&\
make &&\
make install &&\
cd .. && \
rm -rf Python-${PYTHON2_VERSION} &&\
rm Python-${PYTHON2_VERSION}.tgz &&\
wget "https://bootstrap.pypa.io/pip/2.7/get-pip.py" -O get-pip-2.py &&\
python2 get-pip-2.py &&\
rm get-pip-2.py
RUN apk update && apk add sudo gcc make linux-headers libc-dev openssl-dev python2-dev python3-dev zlib-dev jpeg-dev

CMD ["/bin/bash"]

0 comments on commit 4f0c38e

Please sign in to comment.