Skip to content

Commit

Permalink
Make build working again and use cAdvisor compatible version number
Browse files Browse the repository at this point in the history
  • Loading branch information
olljanat committed Jan 22, 2023
1 parent 6080a56 commit ad963b5
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ help: ## show make targets

.PHONY: prepare
prepare: ## prepare the components
VERSION=$(VERSION) ./scripts/prepare
GO111MODULE=off VERSION=$(VERSION) ./scripts/prepare

.PHONY: static
static: ## build static packages
Expand All @@ -20,7 +20,7 @@ static: ## build static packages

.PHONY: release
release: static ## release
VERSION=$(VERSION) ./scripts/release
GO111MODULE=off VERSION=$(VERSION) ./scripts/release

.PHONY: clean
clean: ## clean the build artifacts
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17.06-ros6
17.06.107
8 changes: 4 additions & 4 deletions scripts/prepare
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ cd $(dirname $0)/..

TEMP_SOURCE_DIR=.tmp

trash -k -T ${TEMP_SOURCE_DIR}
trash --debug -k -T ${TEMP_SOURCE_DIR}
mkdir -p ./components
mv ${TEMP_SOURCE_DIR}/github.com/rancher/docker-cli components/cli
mv ${TEMP_SOURCE_DIR}/github.com/rancher/docker components/engine
mv ${TEMP_SOURCE_DIR}/github.com/rancher/docker-ce-packaging components/packaging
mv ${TEMP_SOURCE_DIR}/github.com/burmilla/docker-cli components/cli
mv ${TEMP_SOURCE_DIR}/github.com/burmilla/docker components/engine
mv ${TEMP_SOURCE_DIR}/github.com/burmilla/docker-ce-packaging components/packaging

cp VERSION components/cli/
cp VERSION components/engine/
Expand Down
6 changes: 3 additions & 3 deletions vendor.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github.com/rancher/docker-cli fa7c1da # release-v17.06-ros
github.com/rancher/docker 6368e2f # release-v17.06-ros
github.com/rancher/docker-ce-packaging d12ecf67 # release-v17.06-ros
github.com/burmilla/docker-cli a4ecad9d # release-v17.06-ros
github.com/burmilla/docker 2586a58bf # release-v17.06-ros
github.com/burmilla/docker-ce-packaging d12ecf67 # release-v17.06-ros

0 comments on commit ad963b5

Please sign in to comment.