Commit Graph

262 Commits

Author SHA1 Message Date
A.J. Beamon 67e783acf8 Merge branch 'release-6.2' into merge-release-6.2-into-release-6.3
# Conflicts:
#	cmake/CompileBoost.cmake
#	cmake/FDBComponents.cmake
#	fdbrpc/AsyncFileCached.actor.h
#	fdbrpc/simulator.h
#	fdbserver/KeyValueStoreSQLite.actor.cpp
#	fdbserver/Knobs.cpp
#	fdbserver/Knobs.h
#	fdbserver/storageserver.actor.cpp
#	flow/Knobs.h
#	flow/network.h
2021-02-08 09:20:28 -08:00
Markus Pilman cdbbc8a689 use ARG to storge image version 2021-02-04 11:16:18 -07:00
Markus Pilman 3832cfcc39 increased version of Dockerfile.devel 2021-02-01 11:28:02 -07:00
Markus Pilman 0805902770 Merge branch 'release-6.2' of github.com:apple/foundationdb into features/add-jemalloc-boost 2021-02-01 11:27:12 -07:00
Markus Pilman 9932c00d46
Update build/docker-compose.yaml
Co-authored-by: Alvin Moore <36203359+AlvinMooreSr@users.noreply.github.com>
2021-02-01 08:10:35 -07:00
Markus Pilman 27c7a37690
Update build/Dockerfile.devel
Co-authored-by: Alvin Moore <36203359+AlvinMooreSr@users.noreply.github.com>
2021-02-01 08:10:26 -07:00
Markus Pilman ccea717464
Update build/Dockerfile
Co-authored-by: Alvin Moore <36203359+AlvinMooreSr@users.noreply.github.com>
2021-02-01 08:10:20 -07:00
Alvin Moore 7e51878904
Merge pull request #4153 from sears/enable-boringssl
Switch to BoringSSL by default
2021-01-31 20:24:42 -05:00
Markus Pilman fd89c1d12d update devel and compose 2021-01-29 12:21:13 -07:00
Markus Pilman a39d1becf3 add jemalloc to Dockerfile 2021-01-29 11:52:41 -07:00
Markus Pilman a056eb8136 delete c7 file 2021-01-29 10:42:16 -07:00
Markus Pilman a7501fb122 install boost in docker image and make sure cmake finds it 2021-01-29 10:41:17 -07:00
Alvin Moore 304cb10758 Enabled warnings as errors within CI 2021-01-29 11:21:50 -05:00
Russell Sears a977997e4a Bump development + build docker version numbers 2021-01-22 20:39:12 +00:00
Russell Sears 589eaf54d7 Switch to BoringSSL by default 2021-01-22 20:39:12 +00:00
Jingyu Zhou bbb56e4089 Merge branch 'release-6.2' of https://github.com/apple/foundationdb into release-6.3 2020-12-23 14:26:59 -08:00
Russell Sears 4cb821cd63 Merge remote-tracking branch 'upstream/release-6.2' into merge-6.2-to-6.3 2020-12-09 15:47:44 -08:00
Markus Pilman 5b57f03eac
Merge branch 'release-6.2' into features/toml11-docker 2020-12-09 12:16:52 -07:00
Russell Sears 207a96ad5a Add boringssl and ctest2junit to docker; move environment-independent CCACHE flags from Dockerfile.devel to Dockerfile 2020-12-07 15:06:34 -08:00
Alvin Moore ae50dc9dae Updated docker compose version 2020-12-03 02:16:24 -05:00
Alvin Moore 245cf28ace Updated docker repositories to Vault repos 2020-12-03 02:12:55 -05:00
Markus Pilman 2bb2a45448
Merge branch 'release-6.2' into features/toml11-docker 2020-10-28 09:27:13 -06:00
Markus Pilman af2ac57532
Update build/Dockerfile
Co-authored-by: Alvin Moore <36203359+AlvinMooreSr@users.noreply.github.com>
2020-10-27 16:42:34 -06:00
Steve Atherton 99c1880a83 Merge commit 'f9581de2005e6b085776e81b9fcaa16442b32589' into merge-6.2-to-6.3
# Conflicts:
#	fdbserver/Knobs.cpp
#	fdbserver/Knobs.h
2020-10-27 12:21:26 -07:00
Markus Pilman 02d979988c
Update build/docker-compose.yaml
Co-authored-by: Alvin Moore <36203359+AlvinMooreSr@users.noreply.github.com>
2020-10-27 10:47:47 -06:00
Markus Pilman 639fe8ca38
Update build/Dockerfile.devel
Co-authored-by: Alvin Moore <36203359+AlvinMooreSr@users.noreply.github.com>
2020-10-27 10:47:40 -06:00
Markus Pilman fd82085a9c
Update build/Dockerfile
Co-authored-by: Alvin Moore <36203359+AlvinMooreSr@users.noreply.github.com>
2020-10-27 10:47:32 -06:00
Andrew Noyes d0bc9c95df Update Dockerfile.devel version 2020-10-26 13:36:26 -07:00
Andrew Noyes e3ab9e93f6 Change version to 0.1.19 2020-10-26 13:33:44 -07:00
Andrew Noyes cd596dcfd5 Install asan in foundationdb-build docker image 2020-10-26 13:33:44 -07:00
Markus Pilman 531c106b32 add toml11 to docker image 2020-10-26 11:41:13 -06:00
Markus Pilman 70440b858d add toml11 to docker image 2020-10-26 11:38:46 -06:00
Russell Sears 92a5178b4a
Merge branch 'release-6.3' into release-6-2-2020-10-23 2020-10-23 12:24:48 -07:00
Daniel Smith c7345b8ab5 Fix static linking of lz4
Conflicts:
	fdbserver/CMakeLists.txt
2020-10-21 10:26:55 -07:00
Daniel Smith 433c5cba4e Install the static lz4 library as well 2020-10-21 10:24:56 -07:00
Daniel Smith fd607c5236 Update with newest docker container version
Conflicts:
	build/docker-compose.yaml
2020-10-21 10:24:44 -07:00
Daniel Smith 1c2dafee6b Bump Dockerfile versions
Conflicts:
	build/Dockerfile
	build/Dockerfile.devel
2020-10-21 10:23:45 -07:00
Daniel Smith 1b82adde3a Use lz4
Conflicts:
	cmake/CompileRocksDB.cmake
	fdbserver/CMakeLists.txt
2020-10-19 13:33:43 -07:00
Jingyu Zhou 8f17a1a5d6 Merge branch 'release-6.2' into release-6.3 2020-10-16 15:25:39 -07:00
Alvin Moore 5f1312f861
Merge pull request #3792 from sfc-gh-tclinkenbeard/add-jq-to-dockerdevel
Install jq in development Docker image
2020-10-08 08:25:36 -04:00
sfc-gh-tclinkenbeard c50931832c Update base version in Dockerfile.devel 2020-09-30 10:45:25 -07:00
Evan Tschannen 2d788b309f Merge branch 'release-6.2' into release-6.3
# Conflicts:
#	documentation/sphinx/source/api-error-codes.rst
#	flow/ThreadHelper.actor.h
#	flow/error_definitions.h
2020-09-24 17:16:58 -07:00
Alvin Moore 9d130bdecf Updated OpenSsl version from 1.1.1d to 1.1.1h 2020-09-24 19:23:56 -04:00
sfc-gh-tclinkenbeard fda996f68d Update devel docker image version to 0.11.9 2020-09-24 11:19:48 -07:00
sfc-gh-tclinkenbeard af76bfc1df Install jq in development Docker image
This helps with parsing JSON logs
2020-09-20 16:00:39 -07:00
Evan Tschannen 29eec30183 Merge branch 'release-6.2' into release-6.3
# Conflicts:
#	CMakeLists.txt
#	build/Dockerfile
#	build/Dockerfile.devel
#	documentation/sphinx/source/downloads.rst
#	fdbserver/Knobs.cpp
#	fdbserver/LogSystem.h
#	fdbserver/MasterProxyServer.actor.cpp
#	fdbserver/TagPartitionedLogSystem.actor.cpp
#	fdbserver/WaitFailure.actor.cpp
#	fdbserver/fdbserver.vcxproj
#	fdbserver/fdbserver.vcxproj.filters
#	packaging/msi/FDBInstaller.wxs
2020-08-31 01:10:29 -07:00
Alvin Moore aa8bac49b2 Added cgdb package 2020-08-18 08:43:45 -04:00
Alvin Moore 4242008d06 Renamed the go binary such that it is not used by default 2020-07-31 02:18:57 -07:00
Alvin Moore 6a00836437 Installed RocksDB
Localized the time zone
2020-07-20 11:35:37 -07:00
Daniel Smith 8c00b391da Merge remote-tracking branch 'upstream/release-6.3' into rocksdb-build 2020-06-10 21:29:20 +00:00