diff --git a/resources/docker-images/build.sh b/resources/docker-images/build.sh index a3254a2f52..6e81d8a27e 100755 --- a/resources/docker-images/build.sh +++ b/resources/docker-images/build.sh @@ -74,10 +74,6 @@ build_action() { if [[ "${platform}" == "base" ]]; then docker pull --platform "amd64" "ubuntu:${UBUNTU_VERSION:-${KEYMAN_DEFAULT_VERSION_UBUNTU_CONTAINER}}" - ### TMP code - elif [[ "${platform}" == "core" ]]; then - cp "${KEYMAN_ROOT}/linux/debian/control" "${platform}" - ### TMP END elif [[ "${platform}" == "linux" ]]; then cp "${KEYMAN_ROOT}/linux/debian/control" "${platform}" fi diff --git a/resources/docker-images/core/.gitignore b/resources/docker-images/core/.gitignore deleted file mode 100644 index 4db28ac495..0000000000 --- a/resources/docker-images/core/.gitignore +++ /dev/null @@ -1 +0,0 @@ -control diff --git a/resources/docker-images/core/Dockerfile b/resources/docker-images/core/Dockerfile index 4a678da31c..55ca0b1ef2 100644 --- a/resources/docker-images/core/Dockerfile +++ b/resources/docker-images/core/Dockerfile @@ -14,17 +14,6 @@ USER root RUN apt-get install -qy git jq llvm meson pkgconf \ xvfb xserver-xephyr metacity -#### TMP until we properly figure out the dependencies needed for Core -#### We should not need to install /tmp/control -# Install dependencies -ADD control /tmp/control -RUN apt-get install -qy python3 python3-setuptools python3-coverage \ - devscripts equivs libdatetime-perl meson pkgconf lcov gcovr xvfb \ - xserver-xephyr metacity mutter dbus-x11 weston xwayland && \ - (yes | mk-build-deps --install /tmp/control) || true && \ - rm /tmp/control -#### TMP END - # Pre-install emscripten USER build ARG REQUIRED_EMSCRIPTEN_VERSION=1.0