diff options
| author | Dsaster <78389441+dsastr@users.noreply.github.com> | 2021-02-06 22:07:15 +0100 |
|---|---|---|
| committer | Dsaster <78389441+dsastr@users.noreply.github.com> | 2021-02-06 22:07:15 +0100 |
| commit | 7b7d9ac83ebe77efb176b7a20a98b2baf3dfa852 (patch) | |
| tree | be4762b325d9f62c4cd6c97db5b4fd7586218e7e /docker | |
| parent | 563b14a97f6208e790843931afc54981f8e8f4b3 (diff) | |
Use existing scripts in contrib/docker
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 11 | ||||
| -rwxr-xr-x | docker/build.sh | 20 |
2 files changed, 0 insertions, 31 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 3bc11235..00000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM ubuntu:20.04 - -RUN dpkg --add-architecture i386 && \ -apt update && \ -DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends binutils-arm-none-eabi build-essential git libpng-dev wine wine32 && \ -rm -r /var/cache/apt/archives /var/lib/apt/lists - -# Run a persistent wineserver to avoid errors like -# wine: a wine server seems to be running, but I cannot connect to it. -RUN mkdir -p /root/.wine -CMD /usr/lib/wine/wineserver32 -f -p diff --git a/docker/build.sh b/docker/build.sh deleted file mode 100755 index 1ce28543..00000000 --- a/docker/build.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -set -eou pipefail - -PROJECT_NAME=${PROJECT_NAME:-pokediamond} -PROJECT_PATH=${PROJECT_PATH:-$(dirname $(pwd))} - -# Build container image -IMAGE_NAME=${IMAGE_NAME:-$PROJECT_NAME-image} -docker build -t $IMAGE_NAME . - -# Start container and wine server -CONTAINER_NAME=${CONTAINER_NAME:-$PROJECT_NAME} -docker run -d -i --name $CONTAINER_NAME --rm -t -v $PROJECT_PATH:/$PROJECT_NAME -w /$PROJECT_NAME $IMAGE_NAME - -# Build selected project, always exit successfully to ensure container stops -docker exec -i -t $CONTAINER_NAME make $@ || true - -# Exit the container and remove -docker stop $CONTAINER_NAME |