mirror of
https://github.com/stucki/docker-lineageos
synced 2024-12-19 17:12:29 -05:00
Merge pull request #38 from bebehei/docker-build-pull
Run docker pull during build and simplify code
This commit is contained in:
commit
b102c73096
13
run.sh
13
run.sh
@ -39,14 +39,13 @@ if [ $? -ne 0 ]; then
|
||||
echo "docker command not found"
|
||||
exit $?
|
||||
elif [[ $FORCE_BUILD = 1 ]] || ! echo "$IMAGE_EXISTS" | grep -q "$TAG"; then
|
||||
# Pull Ubuntu image to be sure it's up to date
|
||||
echo "Fetching Docker \"ubuntu\" image..."
|
||||
docker pull ubuntu:16.04
|
||||
|
||||
echo "Building Docker image $REPOSITORY:$TAG..."
|
||||
USERID=$(id -u)
|
||||
GROUPID=$(id -g)
|
||||
docker build -t $REPOSITORY:$TAG --build-arg hostuid=$USERID --build-arg hostgid=$GROUPID .
|
||||
docker build \
|
||||
--pull \
|
||||
-t $REPOSITORY:$TAG \
|
||||
--build-arg hostuid=$(id -u) \
|
||||
--build-arg hostgid=$(id -g) \
|
||||
.
|
||||
|
||||
# After successful build, delete existing containers
|
||||
IS_EXISTING=$(docker inspect -f '{{.Id}}' $CONTAINER 2>/dev/null) || true
|
||||
|
Loading…
Reference in New Issue
Block a user