Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
docker-baseimage-ubuntu
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
JetBrains YouTrack
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Prosper
docker-baseimage-ubuntu
Commits
f4531811
Commit
f4531811
authored
3 years ago
by
Griefed
Browse files
Options
Downloads
Patches
Plain Diff
fix: Move sources.list acquisition and decision to fetcher
parent
47b143b0
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Dockerfile
+20
-13
20 additions, 13 deletions
Dockerfile
with
20 additions
and
13 deletions
Dockerfile
+
20
−
13
View file @
f4531811
...
...
@@ -12,7 +12,9 @@ RUN \
xz
RUN
\
mkdir
/focal-rootfs
&&
\
mkdir
\
/focal-rootfs
\
/tmp
&&
\
curl
-o
\
/focal-rootfs.tar.gz
-L
\
https://partner-images.canonical.com/core/focal/
${
FOCAL_RELEASE_DATE
}
/ubuntu-focal-core-cloudimg-
${
FOCAL_ARCH
}
-root
.tar.gz
&&
\
...
...
@@ -20,10 +22,25 @@ RUN \
/focal-rootfs.tar.gz
-C
\
/focal-rootfs
COPY
sources.list /tmp/
COPY
sources.list.arm /tmp/
RUN
\
if
[
$FOCAL_ARCH
=
"amd64"
]
;
then
rm /tmp/sources.list.arm
else
rm /tmp/sources.list
mv \
/tmp/sources.list.arm \
/tmp/sources.list
fi
FROM
scratch
COPY
--from=fetcher /focal-rootfs/ /
COPY
--from=fetcher /tmp/sources.list /etc/apt/
ARG
BUILD_DATE="PassMeTheDateMate"
ARG
VERSION="ChangeMe"
LABEL
build_version="Git.Griefed.de version:- ${VERSION} Build-date:- ${BUILD_DATE}"
...
...
@@ -36,9 +53,10 @@ them perfect for learning."
# s6, s6 version and s6 architecture
ARG
OVERLAY_ARCH="amd64"
ARG
OVERLAY_VERSION="v2.2.0.3"
ADD
https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}-installer /tmp/
RUN
chmod
+x /tmp/s6-overlay-
${
OVERLAY_ARCH
}
-installer
&&
/tmp/s6-overlay-
${
OVERLAY_ARCH
}
-installer
/
&&
rm
/tmp/s6-overlay-
${
OVERLAY_ARCH
}
-installer
COPY
patch/ /tmp/patch
# set environment variables
ARG
DEBIAN_FRONTEND="noninteractive"
...
...
@@ -47,17 +65,6 @@ ENV LANGUAGE="en_US.UTF-8"
ENV
LANG="en_US.UTF-8"
ENV
TERM="xterm"
# copy sources
COPY
sources.list /etc/apt/
COPY
sources.list.arm /etc/apt
RUN
\
if
[
$OVERLAY_ARCH
=
"amd64"
]
;
then
rm /etc/apt/sources.list.arm
else
rm /etc/apt/sources.list
fi
RUN
\
echo
"**** Ripped from Ubuntu Docker Logic ****"
&&
\
set
-xe
&&
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment