8000 Update stretch sources by fanzhe328 · Pull Request #210 · aliyun/fc-docker · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Update stretch sources #210

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

Merged
merged 2 commits into from
May 7, 2023
Merged

Update stretch sources #210

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
82f5fdb
update stretch sources
fanzhe328 May 6, 2023
3afeeb2
release 1.10.9
fanzhe328 May 7, 2023
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
2 changes: 1 addition & 1 deletion LATEST
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.10.8
1.10.9
3 changes: 3 additions & 0 deletions commons/Dockerfile.php7.2-stretch-base
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM aliyunfc/php7.2-stretch:standard

RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak
COPY debian-stretch-sources.list /etc/apt/sources.list

# https://tracker.debian.org/pkg/imagemagick
RUN apt-get update && apt-get install -y --force-yes \
wget \
Expand Down
25 changes: 15 additions & 10 deletions commons/Dockerfile.stretch-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,29 @@ RUN apt-get update && apt-get install -y \

# get libpng12-0,libmysqlclient18,libssl1.0.0 in jessie
# https://packages.debian.org/search?keywords=libpng12-0
RUN cp /etc/apt/sources.list /etc/apt/sources.list.bak \
&& echo "deb http://deb.debian.org/debian/ jessie main contrib non-free" > /etc/apt/sources.list \
&& echo "deb-src http://deb.debian.org/debian/ jessie main contrib non-free" >> /etc/apt/sources.list \
&& echo "deb http://security.debian.org/ jessie/updates main contrib non-free" >> /etc/apt/sources.list \
&& echo "deb-src http://security.debian.org/ jessie/updates main contrib non-free" >> /etc/apt/sources.list \
&& echo "deb http://archive.debian.org/debian jessie-backports main contrib non-free" >> /etc/apt/sources.list \
&& echo "deb-src http://archive.debian.org/debian jessie-backports main contrib non-free" >> /etc/apt/sources.list \
&& echo "Acquire::Check-Valid-Until \"false\";" > /etc/apt/apt.conf.d/100disablechecks
# RUN cp /etc/apt/sources.list /etc/apt/sources.list.bak \
# && echo "deb http://deb.debian.org/debian/ jessie main contrib non-free" > /etc/apt/sources.list \
# && echo "deb-src http://deb.debian.org/debian/ jessie main contrib non-free" >> /etc/apt/sources.list \
# && echo "deb http://security.debian.org/ jessie/updates main contrib non-free" >> /etc/apt/sources.list \
# && echo "deb-src http://security.debian.org/ jessie/updates main contrib non-free" >> /etc/apt/sources.list \
# && echo "deb http://archive.debian.org/debian jessie-backports main contrib non-free" >> /etc/apt/sources.list \
# && echo "deb-src http://archive.debian.org/debian jessie-backports main contrib non-free" >> /etc/apt/sources.list \
# && echo "Acquire::Check-Valid-Until \"false\";" > /etc/apt/apt.conf.d/100disablechecks

RUN cp /etc/apt/sources.list /etc/apt/sources.list.bak
COPY ./debian-jessie-sources.list /etc/apt/sources.list
# RUN apt-get install debian-archive-keyring

RUN apt-get update && apt-get install -y \
libpng12-0 \
libmysqlclient18 \
libssl1.0.0 \
libwebp5 \
--no-install-recommends && rm -r /var/lib/apt/lists/*
--no-install-recommends \
--allow-unauthenticated \
&& rm -r /var/lib/apt/lists/*

RUN mv /etc/apt/sources.list.bak /etc/apt/sources.list
RUN rm /etc/apt/apt.conf.d/100disablechecks

RUN apt-get update && apt-get install -y \
nfs-common gnupg ca-certificates \
Expand Down
21 changes: 14 additions & 7 deletions commons/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@

build:
docker build -t aliyunfc/fc-runtime:jessie -f Dockerfile.jessie-base .
docker build -t aliyunfc/fc-runtime:stretch-base -f Dockerfile.stretch-base .
docker build -t aliyunfc/fc-runtime:java8-stretch-base -f Dockerfile.java8-stretch-base .
docker build -t aliyunfc/fc-runtime:java11-stretch-base -f Dockerfile.java11-stretch-base .
docker build -t aliyunfc/fc-runtime:python36-stretch-base -f Dockerfile.python36stretch-base .
docker build -t aliyunfc/fc-runtime:python39-stretch-base -f Dockerfile.python39stretch-base .
# docker build -t aliyunfc/fc-runtime:custom-stretch-base -f Dockerfile.custom-stretch-base .
docker build -t aliyunfc/fc-runtime:python27-stretch-base -f Dockerfile.python27stretch-base .
docker build -t aliyunfc/fc-runtime:php7.2-stretch-base -f Dockerfile.php7.2-stretch-base .

push:
docker push aliyunfc/fc-runtime:jessie
docker push aliyunfc/fc-runtime:stretch-base
docker push aliyunfc/fc-runtime:java8-stretch-base
docker push aliyunfc/fc-runtime:java11-stretch-base
docker push aliyunfc/fc-runtime:python36-stretch-base
docker push aliyunfc/fc-runtime:python39-stretch-base
# docker push aliyunfc/fc-runtime:custom-stretch-base
docker push aliyunfc/fc-runtime:python27-stretch-base
docker push aliyunfc/fc-runtime:php7.2-stretch-base
docker push aliyunfc/fc-runtime:php7.2-stretch-base

build-and-push-jessie:
docker build -t aliyunfc/fc-runtime:jessie -f Dockerfile.jessie-base .
docker push aliyunfc/fc-runtime:jessie

build-and-push-stretch:
docker build -t aliyunfc/fc-runtime:stretch-base -f Dockerfile.stretch-base .
docker push aliyunfc/fc-runtime:stretch-base

build-and-push:
make build
make push
8 changes: 4 additions & 4 deletions commons/debian-jessie-sources.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deb http://mirrors.aliyun.com/debian/ jessie main non-free contrib
deb-src http://mirrors.aliyun.com/debian/ jessie main non-free contrib
deb http://mirrors.aliyun.com/debian-security/ jessie/updates main non-free contrib
deb-src http://mirrors.aliyun.com/debian-security/ jessie/updates main non-free contrib
deb http://archive.debian.org/debian/ jessie main non-free contrib
deb-src http://archive.debian.org/debian/ jessie main non-free contrib
deb http://archive.debian.org/debian-security/ jessie/updates main non-free contrib
deb-src http://archive.debian.org/debian-security/ jessie/updates main non-free contrib
16 changes: 8 additions & 8 deletions commons/debian-stretch-sources.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
deb http://mirrors.aliyun.com/debian/ stretch main non-free contrib
deb http://mirrors.aliyun.com/debian/ stretch-updates main non-free contrib
deb http://mirrors.aliyun.com/debian/ stretch-backports main non-free contrib
deb-src http://mirrors.aliyun.com/debian/ stretch main non-free contrib
deb-src http://mirrors.aliyun.com/debian/ stretch-updates main non-free contrib
deb-src http://mirrors.aliyun.com/debian/ stretch-backports main non-free contrib
deb http://mirrors.aliyun.com/debian-security/ stretch/updates main non-free contrib
deb-src http://mirrors.aliyun.com/debian-security/ stretch/updates main non-free contrib
deb http://archive.debian.org/debian/ stretch main contrib non-free
deb http://archive.debian.org/debian/ stretch-proposed-updates main non-free contrib
deb http://archive.debian.org/debian/ stretch-backports main non-free contrib
deb http://archive.debian.org/debian-security stretch/updates main contrib non-free
deb-src http://archive.debian.org/debian/ stretch main contrib non-free
deb-src http://archive.debian.org/debian/ stretch-proposed-updates main contrib non-free
deb-src http://archive.debian.org/debian/ stretch-backports main contrib non-free
deb-src http://archive.debian.org/debian-security stretch/updates main contrib non-free
0