Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
images
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Michal Nowak
images
Commits
7a82dc42
Commit
7a82dc42
authored
May 15, 2020
by
Ondřej Surý
Committed by
Michał Kępień
May 21, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add sphinx-doc dependencies to buster image
parent
2aa539bb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
docker/Makefile
docker/Makefile
+3
-0
docker/bind9/debian-template/Dockerfile
docker/bind9/debian-template/Dockerfile
+1
-2
No files found.
docker/Makefile
View file @
7a82dc42
...
...
@@ -40,6 +40,7 @@ dnstap_debian_sid_i386 := yes
python_qa_debian_buster_amd64
:=
yes
respdiff_debian_buster_amd64
:=
yes
shellcheck_debian_sid_amd64
:=
yes
sphinx_debian_buster_amd64
:=
yes
# Install latest stable version of LLVM/Clang
clang_debian_stretch_amd64
:=
10
...
...
@@ -88,6 +89,7 @@ $(TARGETS): PYTHON_QA = $(python_qa_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS)
:
RESPDIFF = $(respdiff_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS)
:
SHELLCHECK = $(shellcheck_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS)
:
SOFTHSM = $(softhsm_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS)
:
SPHINX = $(sphinx_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS)
:
$
(
info Building
$(CI_REGISTRY_IMAGE)
/
$(CI_REGISTRY_NAME)
from
$(SOURCE_IMAGE)
)
mkdir
-p
bind9/
$@
...
...
@@ -105,6 +107,7 @@ $(TARGETS):
-e
's,@RESPDIFF@,
$(RESPDIFF)
,g'
\
-e
's,@SHELLCHECK@,
$(SHELLCHECK)
,g'
\
-e
's,@SOFTHSM@,
$(SOFTHSM)
,g'
\
-e
's,@SPHINX@,
$(SPHINX)
,g'
\
-e
's,@SOURCE_IMAGE@,
$(SOURCE_IMAGE)
,g'
\
-e
's,@VENDOR@,
$(VENDOR)
,g'
\
-e
's,@VERSION@,
$(VERSION)
,g'
\
...
...
docker/bind9/debian-template/Dockerfile
View file @
7a82dc42
...
...
@@ -72,8 +72,6 @@ RUN apt-get -y install \
python3-ply
\
python3-pytest
\
python3-requests
\
python3-sphinx
\
python3-sphinx-rtd-theme
\
sudo
\
xsltproc
\
zip
\
...
...
@@ -111,6 +109,7 @@ RUN if [ "@RESPDIFF@" = "yes" ]; then apt-get -y install python3-dpkt python3-lm
RUN if
[
"@SHELLCHECK@"
=
"yes"
]
;
then
apt-get
-y
install
shellcheck
;
fi
RUN if
[
"@SOFTHSM@"
-ge
"2"
]
2>/dev/null
;
then
apt-get
-y
install
libsofthsm2 softhsm2
;
fi
RUN if
[
"@SOFTHSM@"
-lt
"2"
]
2>/dev/null
;
then
apt-get
-y
install
libsofthsm softhsm
;
fi
RUN if
[
"@SPHINX@"
=
"yes"
]
2>/dev/null
;
then
apt-get
-y
install
python3-sphinx python3-sphinx-rtd-theme texlive-full texlive-xetex xindy
;
fi
COPY
kyua.tar /
RUN if
[
!
-s
/kyua.tar
]
;
then
\
curl
-sSL
"https://github.com/jmmv/atf/releases/download/atf-
${
ATF_VERSION
}
/atf-
${
ATF_VERSION
}
.tar.gz"
|
tar
-xz
-C
/usr/src
&&
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment