remove SYSTEM=docker during build, update dockerignore (#2017)
This commit is contained in:
parent
02be5f3618
commit
6193047c35
|
@ -1,3 +1,5 @@
|
||||||
# We include .git in the build context because excluding it would break the
|
# We include .git in the build context because excluding it would break the
|
||||||
# "make release" target, which uses git to retrieve the build version and tag.
|
# "make release" target, which uses git to retrieve the build version and tag.
|
||||||
#.git
|
#.git
|
||||||
|
|
||||||
|
/tests
|
||||||
|
|
10
.gitignore
vendored
10
.gitignore
vendored
|
@ -12,6 +12,9 @@
|
||||||
*.test
|
*.test
|
||||||
*.cover
|
*.cover
|
||||||
|
|
||||||
|
# Test binaries, built from *_test.go
|
||||||
|
pkg/csplugin/tests/cs_plugin_test*
|
||||||
|
|
||||||
# Output of the go coverage tool, specifically when used with LiteIDE
|
# Output of the go coverage tool, specifically when used with LiteIDE
|
||||||
*.out
|
*.out
|
||||||
|
|
||||||
|
@ -31,13 +34,10 @@ plugins/notifications/splunk/notification-splunk
|
||||||
plugins/notifications/email/notification-email
|
plugins/notifications/email/notification-email
|
||||||
plugins/notifications/dummy/notification-dummy
|
plugins/notifications/dummy/notification-dummy
|
||||||
|
|
||||||
#test binaries
|
# Test cache (downloaded files)
|
||||||
pkg/csplugin/tests/cs_plugin_test*
|
|
||||||
|
|
||||||
#test cache (downloaded files)
|
|
||||||
.cache
|
.cache
|
||||||
|
|
||||||
#release stuff
|
# Release stuff
|
||||||
crowdsec-v*
|
crowdsec-v*
|
||||||
pkg/cwhub/hubdir/.index.json
|
pkg/cwhub/hubdir/.index.json
|
||||||
msi
|
msi
|
||||||
|
|
|
@ -10,7 +10,7 @@ COPY . .
|
||||||
# wizard.sh requires GNU coreutils
|
# wizard.sh requires GNU coreutils
|
||||||
RUN apk add --no-cache git gcc libc-dev make bash gettext binutils-gold coreutils && \
|
RUN apk add --no-cache git gcc libc-dev make bash gettext binutils-gold coreutils && \
|
||||||
echo "githubciXXXXXXXXXXXXXXXXXXXXXXXX" > /etc/machine-id && \
|
echo "githubciXXXXXXXXXXXXXXXXXXXXXXXX" > /etc/machine-id && \
|
||||||
SYSTEM="docker" make clean release && \
|
make clean release && \
|
||||||
cd crowdsec-v* && \
|
cd crowdsec-v* && \
|
||||||
./wizard.sh --docker-mode && \
|
./wizard.sh --docker-mode && \
|
||||||
cd - >/dev/null && \
|
cd - >/dev/null && \
|
||||||
|
|
|
@ -14,7 +14,7 @@ ENV DEBCONF_NOWARNINGS="yes"
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y -q git gcc libc-dev make bash gettext binutils-gold coreutils tzdata && \
|
apt-get install -y -q git gcc libc-dev make bash gettext binutils-gold coreutils tzdata && \
|
||||||
echo "githubciXXXXXXXXXXXXXXXXXXXXXXXX" > /etc/machine-id && \
|
echo "githubciXXXXXXXXXXXXXXXXXXXXXXXX" > /etc/machine-id && \
|
||||||
SYSTEM="docker" make clean release && \
|
make clean release && \
|
||||||
cd crowdsec-v* && \
|
cd crowdsec-v* && \
|
||||||
./wizard.sh --docker-mode && \
|
./wizard.sh --docker-mode && \
|
||||||
cd - >/dev/null && \
|
cd - >/dev/null && \
|
||||||
|
|
7
Makefile
7
Makefile
|
@ -215,4 +215,11 @@ windows_installer: build
|
||||||
chocolatey: windows_installer
|
chocolatey: windows_installer
|
||||||
@.\make_chocolatey.ps1 -version $(BUILD_VERSION)
|
@.\make_chocolatey.ps1 -version $(BUILD_VERSION)
|
||||||
|
|
||||||
|
# Include tests/bats.mk only if it exists
|
||||||
|
# to allow building without a test/ directory
|
||||||
|
# (i.e. inside docker)
|
||||||
|
ifeq (,$(wildcard tests/bats.mk))
|
||||||
|
bats-clean:
|
||||||
|
else
|
||||||
include tests/bats.mk
|
include tests/bats.mk
|
||||||
|
endif
|
||||||
|
|
Loading…
Reference in a new issue