diff --git a/MOCKCONFIG/traefik.cfg b/MOCKCONFIG/traefik.cfg index 0cf6cd3..844ec73 100644 --- a/MOCKCONFIG/traefik.cfg +++ b/MOCKCONFIG/traefik.cfg @@ -1,2 +1,3 @@ BUILDER="fedora-35-x86_64" -EXTRA_PARAMS="--enable-network" +# --no-bootstrap-image is required to use the dnf modules +EXTRA_PARAMS="--no-bootstrap-image --enable-network --enablerepo=fedora-modular --config-opts package_manager=dnf --config-opts module_enable=nodejs:12 --config-opts module_install=nodejs:12/default" diff --git a/SPECS/traefik.spec b/SPECS/traefik.spec index 757477d..8f5ca2d 100644 --- a/SPECS/traefik.spec +++ b/SPECS/traefik.spec @@ -11,7 +11,7 @@ and configures itself automatically and dynamically. Pointing Traefik at your orchestrator should be the only onfiguration step you need.} Name: traefik -Release: itix1 +Release: itix2 Summary: The Cloud Native Application Proxy License: MIT ExclusiveArch: x86_64 @@ -28,6 +28,8 @@ BuildRequires: breezy BuildRequires: golang >= 1.15 BuildRequires: git BuildRequires: go-bindata +BuildRequires: nodejs +BuildRequires: npm %description %{common_description} @@ -45,13 +47,13 @@ cp %{S:1} %{name}.service cp %{S:2} %{name}.yaml %build -GO111MODULE=off go get github.com/containous/go-bindata/... +(cd webui && npm install && npm run build:nc) # Workaround for "GOVCS disallows using bzr for public XXX" export GOVCS='private:all,public:all' go generate -CGO_ENABLED=0 GO111MODULE=on go build -o %{gobuilddir}/traefik %{goipath}/cmd/traefik +CGO_ENABLED=0 GO111MODULE=on go build -ldflags="-s -w -X 'github.com/traefik/traefik/v2/pkg/version.Version=%Version' -X 'github.com/traefik/traefik/v2/pkg/version.Codename=ITIX' -X 'github.com/traefik/traefik/v2/pkg/version.BuildDate=$(date -Iseconds)'" -o %{gobuilddir}/traefik %{goipath}/cmd/traefik %install install -d %{buildroot}/opt/%{name}/etc/