Skip to content

XDB-144 for 6.3 #37

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
foxyholic merged 5 commits into from
Jan 21, 2023
Merged

XDB-144 for 6.3 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
502d774
Update requirements.txt
makar112233 Jan 20, 2023
a380c8c
Merge branch 'owtech:ow-fork-6.3' into ow-fork-6.3
makar112233 Jan 20, 2023
89846ed
updated build image sh and requirements for tests
makar112233 Jan 20, 2023
7902d97
Merge pull request #3 from makar112233/bugfix/buildimage
makar112233 Jan 20, 2023
23ce462
extra options has been removed from command and added to the separate…
makar112233 Jan 21, 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 documentation/sphinx/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--index-url https://pypi.python.org/simple
sphinx==1.6.1
sphinx==1.6.7
sphinx-bootstrap-theme==0.4.8
docutils==0.16
Jinja2==3.0.3
6 changes: 6 additions & 0 deletions packaging/docker/build-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,12 @@ function build_and_push_images () {
compile_ycsb
fi
logg "TAG ${image_tag#${registry}/foundationdb/}"
##############################################
#EXTRA OPTIONS
#You can add extra options HTTP_PROXY and HTTPS_PROXY as parameters in command "docker build"
# --build-arg HTTPS_PROXY="${HTTPS_PROXY}" \
# --build-arg HTTP_PROXY="${HTTP_PROXY}" \
##############################################
docker build \
--label "org.foundationdb.version=${fdb_version}" \
--label "org.foundationdb.build_date=${build_date}" \
Expand Down