diff --git a/.gitignore b/.gitignore index f2342425d..5665755cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ .idea cri-dockerd -build diff --git a/packaging/common.mk b/build/common.mk similarity index 100% rename from packaging/common.mk rename to build/common.mk diff --git a/packaging/.gitignore b/build/packaging/.gitignore similarity index 100% rename from packaging/.gitignore rename to build/packaging/.gitignore diff --git a/packaging/Makefile b/build/packaging/Makefile similarity index 98% rename from packaging/Makefile rename to build/packaging/Makefile index cbe2e07d0..a0554f35d 100644 --- a/packaging/Makefile +++ b/build/packaging/Makefile @@ -1,4 +1,4 @@ -include common.mk +include ../common.mk APP_DIR:=$(realpath $(CURDIR)/..) diff --git a/packaging/README.md b/build/packaging/README.md similarity index 100% rename from packaging/README.md rename to build/packaging/README.md diff --git a/packaging/deb/.gitignore b/build/packaging/deb/.gitignore similarity index 100% rename from packaging/deb/.gitignore rename to build/packaging/deb/.gitignore diff --git a/packaging/deb/Makefile b/build/packaging/deb/Makefile similarity index 99% rename from packaging/deb/Makefile rename to build/packaging/deb/Makefile index 8792364ae..360251bba 100644 --- a/packaging/deb/Makefile +++ b/build/packaging/deb/Makefile @@ -1,4 +1,4 @@ -include ../common.mk +include ../../common.mk APP_DIR:=$(realpath $(CURDIR)/../../) GITCOMMIT?=$(shell cd $(APP_DIR) && git rev-parse --short HEAD) diff --git a/packaging/deb/Makefile-ee b/build/packaging/deb/Makefile-ee similarity index 100% rename from packaging/deb/Makefile-ee rename to build/packaging/deb/Makefile-ee diff --git a/packaging/deb/README.md b/build/packaging/deb/README.md similarity index 100% rename from packaging/deb/README.md rename to build/packaging/deb/README.md diff --git a/packaging/deb/build-deb b/build/packaging/deb/build-deb similarity index 100% rename from packaging/deb/build-deb rename to build/packaging/deb/build-deb diff --git a/packaging/deb/common/compat b/build/packaging/deb/common/compat similarity index 100% rename from packaging/deb/common/compat rename to build/packaging/deb/common/compat diff --git a/packaging/deb/common/control b/build/packaging/deb/common/control similarity index 100% rename from packaging/deb/common/control rename to build/packaging/deb/common/control diff --git a/packaging/deb/common/cri-docker.docker.upstart b/build/packaging/deb/common/cri-docker.docker.upstart similarity index 100% rename from packaging/deb/common/cri-docker.docker.upstart rename to build/packaging/deb/common/cri-docker.docker.upstart diff --git a/packaging/deb/common/rules b/build/packaging/deb/common/rules similarity index 100% rename from packaging/deb/common/rules rename to build/packaging/deb/common/rules diff --git a/packaging/deb/debian-bullseye/Dockerfile b/build/packaging/deb/debian-bullseye/Dockerfile similarity index 100% rename from packaging/deb/debian-bullseye/Dockerfile rename to build/packaging/deb/debian-bullseye/Dockerfile diff --git a/packaging/deb/debian-buster/Dockerfile b/build/packaging/deb/debian-buster/Dockerfile similarity index 100% rename from packaging/deb/debian-buster/Dockerfile rename to build/packaging/deb/debian-buster/Dockerfile diff --git a/packaging/deb/gen-deb-ver b/build/packaging/deb/gen-deb-ver similarity index 100% rename from packaging/deb/gen-deb-ver rename to build/packaging/deb/gen-deb-ver diff --git a/packaging/deb/raspbian-bullseye/Dockerfile b/build/packaging/deb/raspbian-bullseye/Dockerfile similarity index 100% rename from packaging/deb/raspbian-bullseye/Dockerfile rename to build/packaging/deb/raspbian-bullseye/Dockerfile diff --git a/packaging/deb/raspbian-buster/Dockerfile b/build/packaging/deb/raspbian-buster/Dockerfile similarity index 100% rename from packaging/deb/raspbian-buster/Dockerfile rename to build/packaging/deb/raspbian-buster/Dockerfile diff --git a/packaging/deb/ubuntu-bionic/Dockerfile b/build/packaging/deb/ubuntu-bionic/Dockerfile similarity index 100% rename from packaging/deb/ubuntu-bionic/Dockerfile rename to build/packaging/deb/ubuntu-bionic/Dockerfile diff --git a/packaging/deb/ubuntu-cosmic/Dockerfile b/build/packaging/deb/ubuntu-cosmic/Dockerfile similarity index 100% rename from packaging/deb/ubuntu-cosmic/Dockerfile rename to build/packaging/deb/ubuntu-cosmic/Dockerfile diff --git a/packaging/deb/ubuntu-disco/Dockerfile b/build/packaging/deb/ubuntu-disco/Dockerfile similarity index 100% rename from packaging/deb/ubuntu-disco/Dockerfile rename to build/packaging/deb/ubuntu-disco/Dockerfile diff --git a/packaging/deb/ubuntu-eoan/Dockerfile b/build/packaging/deb/ubuntu-eoan/Dockerfile similarity index 100% rename from packaging/deb/ubuntu-eoan/Dockerfile rename to build/packaging/deb/ubuntu-eoan/Dockerfile diff --git a/packaging/deb/ubuntu-focal/Dockerfile b/build/packaging/deb/ubuntu-focal/Dockerfile similarity index 100% rename from packaging/deb/ubuntu-focal/Dockerfile rename to build/packaging/deb/ubuntu-focal/Dockerfile diff --git a/packaging/deb/ubuntu-jammy/Dockerfile b/build/packaging/deb/ubuntu-jammy/Dockerfile similarity index 100% rename from packaging/deb/ubuntu-jammy/Dockerfile rename to build/packaging/deb/ubuntu-jammy/Dockerfile diff --git a/packaging/deb/ubuntu-xenial/Dockerfile b/build/packaging/deb/ubuntu-xenial/Dockerfile similarity index 100% rename from packaging/deb/ubuntu-xenial/Dockerfile rename to build/packaging/deb/ubuntu-xenial/Dockerfile diff --git a/packaging/rpm/.gitignore b/build/packaging/rpm/.gitignore similarity index 100% rename from packaging/rpm/.gitignore rename to build/packaging/rpm/.gitignore diff --git a/packaging/rpm/Makefile b/build/packaging/rpm/Makefile similarity index 99% rename from packaging/rpm/Makefile rename to build/packaging/rpm/Makefile index 8aa5b87ca..8aedb311e 100644 --- a/packaging/rpm/Makefile +++ b/build/packaging/rpm/Makefile @@ -1,4 +1,4 @@ -include ../common.mk +include ../../common.mk APP_DIR:=$(realpath $(CURDIR)/../../) STATIC_VERSION:=$(shell ../static/gen-static-ver $(APP_DIR) $(VERSION)) diff --git a/packaging/rpm/Makefile-ee b/build/packaging/rpm/Makefile-ee similarity index 100% rename from packaging/rpm/Makefile-ee rename to build/packaging/rpm/Makefile-ee diff --git a/packaging/rpm/README.md b/build/packaging/rpm/README.md similarity index 100% rename from packaging/rpm/README.md rename to build/packaging/rpm/README.md diff --git a/packaging/rpm/SPECS/cri-dockerd.spec b/build/packaging/rpm/SPECS/cri-dockerd.spec similarity index 100% rename from packaging/rpm/SPECS/cri-dockerd.spec rename to build/packaging/rpm/SPECS/cri-dockerd.spec diff --git a/packaging/rpm/amazonlinux-2/Dockerfile b/build/packaging/rpm/amazonlinux-2/Dockerfile similarity index 100% rename from packaging/rpm/amazonlinux-2/Dockerfile rename to build/packaging/rpm/amazonlinux-2/Dockerfile diff --git a/packaging/rpm/centos-7/Dockerfile b/build/packaging/rpm/centos-7/Dockerfile similarity index 100% rename from packaging/rpm/centos-7/Dockerfile rename to build/packaging/rpm/centos-7/Dockerfile diff --git a/packaging/rpm/centos-8/Dockerfile b/build/packaging/rpm/centos-8/Dockerfile similarity index 100% rename from packaging/rpm/centos-8/Dockerfile rename to build/packaging/rpm/centos-8/Dockerfile diff --git a/packaging/rpm/centos-stream/Dockerfile b/build/packaging/rpm/centos-stream/Dockerfile similarity index 100% rename from packaging/rpm/centos-stream/Dockerfile rename to build/packaging/rpm/centos-stream/Dockerfile diff --git a/packaging/rpm/fedora-33/Dockerfile b/build/packaging/rpm/fedora-33/Dockerfile similarity index 100% rename from packaging/rpm/fedora-33/Dockerfile rename to build/packaging/rpm/fedora-33/Dockerfile diff --git a/packaging/rpm/fedora-34/Dockerfile b/build/packaging/rpm/fedora-34/Dockerfile similarity index 100% rename from packaging/rpm/fedora-34/Dockerfile rename to build/packaging/rpm/fedora-34/Dockerfile diff --git a/packaging/rpm/fedora-35/Dockerfile b/build/packaging/rpm/fedora-35/Dockerfile similarity index 100% rename from packaging/rpm/fedora-35/Dockerfile rename to build/packaging/rpm/fedora-35/Dockerfile diff --git a/packaging/rpm/fedora-36/Dockerfile b/build/packaging/rpm/fedora-36/Dockerfile similarity index 100% rename from packaging/rpm/fedora-36/Dockerfile rename to build/packaging/rpm/fedora-36/Dockerfile diff --git a/packaging/rpm/gen-rpm-ver b/build/packaging/rpm/gen-rpm-ver similarity index 100% rename from packaging/rpm/gen-rpm-ver rename to build/packaging/rpm/gen-rpm-ver diff --git a/packaging/rpm/oraclelinux-7/Dockerfile b/build/packaging/rpm/oraclelinux-7/Dockerfile similarity index 100% rename from packaging/rpm/oraclelinux-7/Dockerfile rename to build/packaging/rpm/oraclelinux-7/Dockerfile diff --git a/packaging/rpm/rhel-7/Dockerfile.ppc64le b/build/packaging/rpm/rhel-7/Dockerfile.ppc64le similarity index 100% rename from packaging/rpm/rhel-7/Dockerfile.ppc64le rename to build/packaging/rpm/rhel-7/Dockerfile.ppc64le diff --git a/packaging/rpm/rhel-7/Dockerfile.s390x b/build/packaging/rpm/rhel-7/Dockerfile.s390x similarity index 100% rename from packaging/rpm/rhel-7/Dockerfile.s390x rename to build/packaging/rpm/rhel-7/Dockerfile.s390x diff --git a/packaging/rpm/rhel-7/Dockerfile.x86_64 b/build/packaging/rpm/rhel-7/Dockerfile.x86_64 similarity index 100% rename from packaging/rpm/rhel-7/Dockerfile.x86_64 rename to build/packaging/rpm/rhel-7/Dockerfile.x86_64 diff --git a/packaging/rpm/rhel-8/Dockerfile.x86_64 b/build/packaging/rpm/rhel-8/Dockerfile.x86_64 similarity index 100% rename from packaging/rpm/rhel-8/Dockerfile.x86_64 rename to build/packaging/rpm/rhel-8/Dockerfile.x86_64 diff --git a/packaging/rpm/sles-12.3/Dockerfile b/build/packaging/rpm/sles-12.3/Dockerfile similarity index 100% rename from packaging/rpm/sles-12.3/Dockerfile rename to build/packaging/rpm/sles-12.3/Dockerfile diff --git a/packaging/rpm/sles-15/Dockerfile b/build/packaging/rpm/sles-15/Dockerfile similarity index 100% rename from packaging/rpm/sles-15/Dockerfile rename to build/packaging/rpm/sles-15/Dockerfile diff --git a/packaging/static/Makefile b/build/packaging/static/Makefile similarity index 99% rename from packaging/static/Makefile rename to build/packaging/static/Makefile index bb6b1fa51..400eb76d6 100644 --- a/packaging/static/Makefile +++ b/build/packaging/static/Makefile @@ -1,4 +1,4 @@ -include ../common.mk +include ../../common.mk APP_DIR:=$(realpath $(CURDIR)/../../) CGO_ENABLED ?= 0 diff --git a/packaging/static/Makefile-ee b/build/packaging/static/Makefile-ee similarity index 100% rename from packaging/static/Makefile-ee rename to build/packaging/static/Makefile-ee diff --git a/packaging/static/gen-static-ver b/build/packaging/static/gen-static-ver similarity index 100% rename from packaging/static/gen-static-ver rename to build/packaging/static/gen-static-ver diff --git a/packaging/static/hash_files b/build/packaging/static/hash_files similarity index 100% rename from packaging/static/hash_files rename to build/packaging/static/hash_files diff --git a/packaging/systemd/cri-docker.service b/build/packaging/systemd/cri-docker.service similarity index 100% rename from packaging/systemd/cri-docker.service rename to build/packaging/systemd/cri-docker.service diff --git a/packaging/systemd/cri-docker.socket b/build/packaging/systemd/cri-docker.socket similarity index 100% rename from packaging/systemd/cri-docker.socket rename to build/packaging/systemd/cri-docker.socket diff --git a/packaging/windows/Dockerfile b/build/packaging/windows/Dockerfile similarity index 100% rename from packaging/windows/Dockerfile rename to build/packaging/windows/Dockerfile diff --git a/packaging/windows/Makefile b/build/packaging/windows/Makefile similarity index 98% rename from packaging/windows/Makefile rename to build/packaging/windows/Makefile index 40edb3caf..c5a9e3af5 100644 --- a/packaging/windows/Makefile +++ b/build/packaging/windows/Makefile @@ -1,4 +1,4 @@ -include ../common.mk +include ../../common.mk APP_DIR:=$(realpath $(CURDIR)/../../) GO_BASE_IMAGE=golang diff --git a/packaging/windows/Makefile-ee b/build/packaging/windows/Makefile-ee similarity index 100% rename from packaging/windows/Makefile-ee rename to build/packaging/windows/Makefile-ee diff --git a/packaging/windows/licenses.txt b/build/packaging/windows/licenses.txt similarity index 100% rename from packaging/windows/licenses.txt rename to build/packaging/windows/licenses.txt diff --git a/docs/content/development/creating-a-release.md b/docs/content/development/creating-a-release.md index 9852344af..8ed1b2eeb 100644 --- a/docs/content/development/creating-a-release.md +++ b/docs/content/development/creating-a-release.md @@ -5,7 +5,7 @@ weight: 3 These are the steps in order to create a new release for `cri-dockerd`. These steps will need to be done by a project maintainer. 1. Setup the repo for a new release - 1. Change the version found in `VERSION`, `cmd/version/version.go`, and `packaging/common.mk` to the new version + 1. Change the version found in `VERSION`, `cmd/version/version.go`, and `build/common.mk` to the new version 2. Create a PR with these changes and merge them to master 3. Build the release artifacts using `make release` 4. Verify the artifacts in the `build/release` directory and make sure they look correct