From 7a460d3cb9e24fdecd3c4ca8f79758071b1c6afc Mon Sep 17 00:00:00 2001
From: core <core@coredoes.dev>
Date: Mon, 27 Nov 2023 11:35:13 -0500
Subject: [PATCH] remove old builder dockerfile, move new ones into folder

---
 .dockerignore                                 |  5 ----
 BUILDING.md                                   | 26 -----------------
 builder-image/Dockerfile                      | 29 -------------------
 .../Dockerfile.ansible                        |  0
 .../Dockerfile.build_env                      |  0
 5 files changed, 60 deletions(-)
 delete mode 100644 .dockerignore
 delete mode 100644 BUILDING.md
 delete mode 100644 builder-image/Dockerfile
 rename Dockerfile.ansible => docker/Dockerfile.ansible (100%)
 rename Dockerfile.build_env => docker/Dockerfile.build_env (100%)

diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 589451e64895e0a125809df72fc972888b15ed2c..0000000000000000000000000000000000000000
--- a/.dockerignore
+++ /dev/null
@@ -1,5 +0,0 @@
-target/*/.fingerprint
-target/*/build
-target/*/deps
-target/*/examples
-target/*/incremental
\ No newline at end of file
diff --git a/BUILDING.md b/BUILDING.md
deleted file mode 100644
index 806797167ba7b2bfc1601dee1bcde1fbf586d22d..0000000000000000000000000000000000000000
--- a/BUILDING.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Building StarKingdoms
-
-StarKingdoms uses a small script called Spacetime as a build tool. Internally, it regenerates and runs a build.ninja file for compilation.
-
-## Dependencies
-
-For compilation, you will need the following tools installed:
-- rust/cargo
-- ninja
-- inkscape
-- sheep (see below)
-- wasm-pack (see below - must be installed in a specific way)
-
-`sheep` and `wasm-pack` can be installed with the build-command `install_tooling`. Other tools will need to be installed with your distribution's package manager.
-`wasm-pack` *must* be installed with `install_tooling`, otherwise the build will crash.
-
-If you get a `sheep: command not found` error, or the same with wasm-pack, add `$HOME/.cargo/bin/` to your `PATH`. 
-
-## Running build commands
-
-Build commands are ran with the `spacetime` shell script. Run `./spacetime <build-command>` to run a build.
-`spacetime` can be run from any directory - you could run `../../spacetime run-server` from `server/src/`, and it would still properly build and run the server.
-
-## Available build commands
-
-Run the build-command `help` to view a list of all build-commands.
\ No newline at end of file
diff --git a/builder-image/Dockerfile b/builder-image/Dockerfile
deleted file mode 100644
index 40d30012e3959dd683b6d82b17c1748a6cf42357..0000000000000000000000000000000000000000
--- a/builder-image/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Dockerfile for our Jenkins CI image
-FROM buildpack-deps:bullseye
-
-ENV RUSTUP_HOME=/usr/local/rustup \
-    CARGO_HOME=/usr/local/cargo \
-    PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.68.2
-
-RUN set -eux; \
-    dpkgArch="$(dpkg --print-architecture)"; \
-    case "${dpkgArch##*-}" in \
-        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='bb31eaf643926b2ee9f4d8d6fc0e2835e03c0a60f34d324048aa194f0b29a71c' ;; \
-        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='6626b90205d7fe7058754c8e993b7efd91dedc6833a11a225b296b7c2941194f' ;; \
-        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='4ccaa7de6b8be1569f6b764acc28e84f5eca342f5162cd5c810891bff7ed7f74' ;; \
-        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='34392b53a25c56435b411d3e575b63aab962034dd1409ba405e708610c829607' ;; \
-        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
-    esac; \
-    url="https://static.rust-lang.org/rustup/archive/1.25.2/${rustArch}/rustup-init"; \
-    wget "$url"; \
-    echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
-    chmod +x rustup-init; \
-    ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
-    rm rustup-init; \
-    chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
-    rustup --version; \
-    cargo --version; \
-    rustc --version; \
-    apt-get update -yqq; \
-    apt-get install -yqq --no-install-recommends build-essential protobuf-compiler docker.io; \
\ No newline at end of file
diff --git a/Dockerfile.ansible b/docker/Dockerfile.ansible
similarity index 100%
rename from Dockerfile.ansible
rename to docker/Dockerfile.ansible
diff --git a/Dockerfile.build_env b/docker/Dockerfile.build_env
similarity index 100%
rename from Dockerfile.build_env
rename to docker/Dockerfile.build_env