apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-06-02 03:12:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

docker cleanup

Browse Source
This commit is contained in:
Russell Sears 2021-04-26 16:23:54 -07:00
parent f155374fd2
commit 8dc487e562
7 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packaging/docker/build-release-docker.sh
View File

@ -37,6 +37,10 @@ mkdir -p ${WEBSITE_BIN_DIR}
tar -C ~/build_output/packages/ -zcvf ${TARBALL} bin lib
cp ~/build_output/packages/lib/libfdb_c.so ${WEBSITE_BIN_DIR}/libfdb_c_${FDB_VERSION}.so
# Login to ECR
# TODO: Move this to a common place instead of repeatedly copy-pasting it.
aws ecr get-login-password | docker login --username AWS --password-stdin ${ECR}
docker pull ${ECR}/ubuntu:18.04
docker tag ${ECR}/ubuntu:18.04 ubuntu:18.04
docker pull ${ECR}/python:3.9-slim
@ -53,14 +57,10 @@ docker tag ${IMAGE} ${ECR}/${IMAGE}
docker build -t ${SIDECAR_IMAGE} \
--build-arg FDB_WEBSITE=file:///mnt/website \
--build-arg FDB_VERSION=$FDB_VERSION \
--build-arg FDB_LIBRARY_VERSIONS=$FDB_VERSION \
--build-arg FDB_ADDITIONAL_VERSIONS=$FDB_VERSION \
-f sidecar/Dockerfile .
docker tag ${SIDECAR_IMAGE} ${ECR}/${SIDECAR_IMAGE}
# Login to ECR
# TODO: Move this to a common place instead of repeatedly copy-pasting it.
aws ecr get-login-password | docker login --username AWS --password-stdin ${ECR}
docker push ${ECR}/${IMAGE}
docker push ${ECR}/${SIDECAR_IMAGE}

5
packaging/docker/release/Dockerfile
View File

@ -57,10 +57,9 @@ WORKDIR /var/fdb
# Set Up Runtime Scripts and Directories
COPY scripts /var/fdb/scripts
COPY release/*.bash /var/fdb/scripts/
RUN chmod u+x scripts/*.bash && \
mkdir -p logs
RUN mkdir -p logs
# Install FoundationDB Client Libraries

0
packaging/docker/scripts/create_cluster_file.bash → packaging/docker/release/create_cluster_file.bash Normal file → Executable file
View File

0
packaging/docker/scripts/create_server_environment.bash → packaging/docker/release/create_server_environment.bash Normal file → Executable file
View File

0
packaging/docker/scripts/download_multiversion_libraries.bash → packaging/docker/release/download_multiversion_libraries.bash Normal file → Executable file
View File

0
packaging/docker/scripts/fdb.bash → packaging/docker/release/fdb.bash Normal file → Executable file
View File

4
packaging/docker/sidecar/Dockerfile
View File

@ -21,7 +21,7 @@ FROM python:3.9-slim
WORKDIR /var/fdb/tmp
ARG FDB_VERSION=6.2.30
ARG FDB_LIBRARY_VERSIONS="6.2.30 6.1.13"
ARG FDB_ADDITIONAL_VERSIONS="6.2.30 6.1.13"
ARG FDB_WEBSITE=https://www.foundationdb.org
# Adding tini as PID 1 https://github.com/krallin/tini
ARG TINI_VERSION=v0.19.0
@ -35,7 +35,7 @@ RUN apt-get update && \
chmod u+x fdbbackup fdbcli fdbdr fdbmonitor fdbrestore fdbserver backup_agent dr_agent && \
mv fdbbackup fdbcli fdbdr fdbmonitor fdbrestore fdbserver backup_agent dr_agent /usr/bin && \
echo ${FDB_VERSION} > /var/fdb/version && mkdir -p /var/fdb/lib && \
for version in $FDB_LIBRARY_VERSIONS; do curl --fail $FDB_WEBSITE/downloads/$version/linux/libfdb_c_$version.so -o /var/fdb/lib/libfdb_c_${version%.*}.so; done && \
for version in $FDB_ADDITIONAL_VERSIONS; do curl --fail $FDB_WEBSITE/downloads/$version/linux/libfdb_c_$version.so -o /var/fdb/lib/libfdb_c_${version%.*}.so; done && \
curl -LO https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-amd64 && \
curl -LO https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-amd64.sha256sum && \
sha256sum -c tini-amd64.sha256sum && \