diff --git a/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= b/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= index d330048e844..99b2490ac37 100755 --- a/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= +++ b/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= @@ -1,5 +1,7 @@ # @generated # Input hashes for repository rule npm_translate_lock(name = "npm", pnpm_lock = "//:pnpm-lock.yaml"). # This file should be checked into version control along with the pnpm-lock.yaml file. -pnpm-lock.yaml=322447152 -package.json=1512585561 +.npmrc=-592547263 +pnpm-lock.yaml=104874376 +package-lock.json=-1109603374 +package.json=752745807 diff --git a/platform/linux/docker/.gitignore b/docker/.gitignore similarity index 100% rename from platform/linux/docker/.gitignore rename to docker/.gitignore diff --git a/platform/linux/docker/Dockerfile b/docker/Dockerfile similarity index 100% rename from platform/linux/docker/Dockerfile rename to docker/Dockerfile diff --git a/platform/linux/docker/Dockerfile.dockerignore b/docker/Dockerfile.dockerignore similarity index 100% rename from platform/linux/docker/Dockerfile.dockerignore rename to docker/Dockerfile.dockerignore diff --git a/platform/linux/docker/README.md b/docker/README.md similarity index 69% rename from platform/linux/docker/README.md rename to docker/README.md index 0bb864d5012..5a090f86db6 100644 --- a/platform/linux/docker/README.md +++ b/docker/README.md @@ -1,6 +1,9 @@ -# Linux +# Building with Docker -These steps will allow you to compile code as described [platform/linux/README.md](../README.md) using a Docker container. All the steps should be executed from the root of the repository. +These steps will allow you to compile code as described [platform/linux/README.md](../platform/linux/README.md) using a Docker container. All the steps should be executed from the root of the repository. + +> [!IMPORTANT] +> Not all platform builds are currently supported. Docker builds are a work in progress. > [!IMPORTANT] > You cannot build MapLibre native using both Docker and host methods at the same time. If you want to switch, you need to clean the repository first, e.g. by using this command: @@ -21,8 +24,8 @@ docker build \ -t maplibre-native-image \ --build-arg USER_UID=$(id -u) \ --build-arg USER_GID=$(id -g) \ - -f platform/linux/docker/Dockerfile \ - platform/linux/docker + -f docker/Dockerfile \ + docker ``` ## Run Docker Container @@ -30,11 +33,11 @@ docker build \ ```bash # Run all build commands using the docker container. # You can also execute build commands from inside the docker container by starting it without the build command. -docker run --rm -it -v "$PWD:/app/" -v "$PWD/platform/linux/docker/.cache:/home/user/.cache" maplibre-native-image +docker run --rm -it -v "$PWD:/app/" -v "$PWD/docker/.cache:/home/user/.cache" maplibre-native-image ``` You can also use the container to run just one specific commands, e.g. `cmake` or `bazel`. Any downloaded dependencies will be cached in the `docker/.cache` directory. ```bash -docker run --rm -it -v "$PWD:/app/" -v "$PWD/platform/linux/docker/.cache:/home/user/.cache" maplibre-native-image cmake ... +docker run --rm -it -v "$PWD:/app/" -v "$PWD/docker/.cache:/home/user/.cache" maplibre-native-image cmake ... ``` diff --git a/platform/linux/docker/startup.sh b/docker/startup.sh similarity index 100% rename from platform/linux/docker/startup.sh rename to docker/startup.sh diff --git a/platform/linux/README.md b/platform/linux/README.md index 687ecc53031..371d4ae1358 100644 --- a/platform/linux/README.md +++ b/platform/linux/README.md @@ -27,7 +27,7 @@ Optional: `libsqlite3-dev` (also available as vendored dependency). ### Building with Docker -See instructions in [docker/README.md](docker/README.md) to build in a docker container. +See instructions in [docker/README.md](../../docker/README.md) to build in a docker container. ## Build diff --git a/platform/linux/docker/.cache/empty_file b/platform/linux/docker/.cache/empty_file deleted file mode 100644 index e69de29bb2d..00000000000