Skip to content

Commit

Permalink
Update the EMP and Data Processing Docker Images to use a pinned vers…
Browse files Browse the repository at this point in the history
…ion of FBPCF and the Ubuntu OS (#1684)

Summary:
Pull Request resolved: #1684

See title.

Reviewed By: gitfish77

Differential Revision: D40074501

fbshipit-source-id: 4d6b14085cd429d5275d671ef02fa063355941ea
  • Loading branch information
musebc authored and facebook-github-bot committed Oct 5, 2022
1 parent 5450c04 commit 80165de
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion build-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ set -e

UBUNTU_RELEASE="20.04"
GITHUB_PACKAGES="ghcr.io/facebookresearch"
FBPCF_VERSION="2.1.66"


PROG_NAME=$0
Expand Down Expand Up @@ -62,7 +63,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
# Docker build must run from the root folder, so all the relative paths work inside the Dockerfile's
cd "$SCRIPT_DIR" || exit

FBPCF_IMAGE="fbpcf/${OS_VARIANT}:latest"
FBPCF_IMAGE="fbpcf/${OS_VARIANT}:${FBPCF_VERSION}"
if [[ " $FBPCF_DEPENDENCY " =~ $PACKAGE ]]; then # Not all packages require fbpcf
IMAGE_PREFIX="fbpcs/" # Current all FBPCF Dependent images are tagged with "fbpcs" prefix
if [ "${FORCE_EXTERNAL}" == false ] && docker image inspect "${FBPCF_IMAGE}" >/dev/null 2>&1; then
Expand Down
4 changes: 2 additions & 2 deletions docker/data_processing/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
ARG os_release="latest"
ARG fbpcf_image="fbpcf/ubuntu:latest"
ARG os_release="20.04"
ARG fbpcf_image

FROM ${fbpcf_image} as dev

Expand Down
4 changes: 2 additions & 2 deletions docker/emp_games/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
ARG os_release="latest"
ARG fbpcf_image="fbpcf/ubuntu:latest"
ARG os_release="20.04"
ARG fbpcf_image

FROM ${fbpcf_image} as dev

Expand Down
2 changes: 1 addition & 1 deletion docker/onedocker/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
ARG os_release="latest"
ARG os_release="20.04"
ARG tag="latest"
FROM fbpcs/data-processing:${tag} as data_processing
FROM fbpcs/emp-games:${tag} as emp_games
Expand Down

0 comments on commit 80165de

Please sign in to comment.