diff --git a/.fossa.yml b/.fossa.yml index 2f79f5b3..6b0cc5bd 100644 --- a/.fossa.yml +++ b/.fossa.yml @@ -1,4 +1,4 @@ -# Copyright 2020-present Open Networking Foundation +#SPDX-FileCopyrightText: 2021 Open Networking Foundation # # SPDX-License-Identifier: Apache-2.0 # diff --git a/.gitignore b/.gitignore index d4f68c66..f97f2417 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Open Networking Foundation +# Copyright 2019 free5GC.org # # SPDX-License-Identifier: Apache-2.0 # diff --git a/.golangci.yml b/.golangci.yml index e646df61..3e923721 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2021 Open Networking Foundation +# Copyright 2019 free5GC.org # # SPDX-License-Identifier: Apache-2.0 # diff --git a/Dockerfile b/Dockerfile index 2cb3af5b..037f2e01 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2019-present Open Networking Foundation +# SPDX-FileCopyrightText: 2021 Open Networking Foundation # # SPDX-License-Identifier: Apache-2.0 # diff --git a/Makefile b/Makefile index 2f6171fa..16f08e65 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ -# Copyright 2019-present Open Networking Foundation +# SPDX-FileCopyrightText: 2021 Open Networking Foundation +# Copyright 2019 free5GC.org # # SPDX-License-Identifier: Apache-2.0 # diff --git a/Makefile_docker b/Makefile_docker deleted file mode 100644 index 3c696a8f..00000000 --- a/Makefile_docker +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2019-present Open Networking Foundation -# -# SPDX-License-Identifier: Apache-2.0 -# - -PROJECT_NAME := free5GC -VERSION ?= $(shell cat ./VERSION) - -## Docker related -DOCKER_REGISTRY ?= -DOCKER_REPOSITORY ?= -DOCKER_TAG ?= ${VERSION} -DOCKER_IMAGENAME := ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}${PROJECT_NAME}:${DOCKER_TAG} -DOCKER_BUILDKIT ?= 1 -DOCKER_BUILD_ARGS ?= - -## Docker labels. Only set ref and commit date if committed -DOCKER_LABEL_VCS_URL ?= $(shell git remote get-url $(shell git remote)) -DOCKER_LABEL_VCS_REF ?= $(shell git diff-index --quiet HEAD -- && git rev-parse HEAD || echo "unknown") -DOCKER_LABEL_COMMIT_DATE ?= $(shell git diff-index --quiet HEAD -- && git show -s --format=%cd --date=iso-strict HEAD || echo "unknown" ) -DOCKER_LABEL_BUILD_DATE ?= $(shell date -u "+%Y-%m-%dT%H:%M:%SZ") - -DOCKER_TARGETS ?= builder webui - -# https://docs.docker.com/engine/reference/commandline/build/#specifying-target-build-stage---target -docker-build: - for target in $(DOCKER_TARGETS); do \ - DOCKER_BUILDKIT=$(DOCKER_BUILDKIT) docker build $(DOCKER_BUILD_ARGS) \ - --target $$target \ - --tag ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}5gc-$$target:${DOCKER_TAG} \ - --build-arg org_label_schema_version="${VERSION}" \ - --build-arg org_label_schema_vcs_url="${DOCKER_LABEL_VCS_URL}" \ - --build-arg org_label_schema_vcs_ref="${DOCKER_LABEL_VCS_REF}" \ - --build-arg org_label_schema_build_date="${DOCKER_LABEL_BUILD_DATE}" \ - --build-arg org_opencord_vcs_commit_date="${DOCKER_LABEL_COMMIT_DATE}" \ - . \ - || exit 1; \ - done - -docker-push: - for target in $(DOCKER_TARGETS); do \ - docker push ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}5gc-$$target:${DOCKER_TAG}; \ - done - -.PHONY: docker-build docker-push diff --git a/VERSION.license b/VERSION.license index 9ad81767..d1d8e927 100644 --- a/VERSION.license +++ b/VERSION.license @@ -1,3 +1,4 @@ SPDX-FileCopyrightText: 2021 Open Networking Foundation +Copyright 2019 free5GC.org SPDX-License-Identifier: Apache-2.0 diff --git a/backend/factory/config.go b/backend/factory/config.go index f67d2c5e..86b0d2bc 100644 --- a/backend/factory/config.go +++ b/backend/factory/config.go @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Open Networking Foundation +// Copyright 2019 free5GC.org // // SPDX-License-Identifier: Apache-2.0 // diff --git a/backend/factory/factory.go b/backend/factory/factory.go index 6cb96723..079468dd 100644 --- a/backend/factory/factory.go +++ b/backend/factory/factory.go @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Open Networking Foundation +// Copyright 2019 free5GC.org // // SPDX-License-Identifier: Apache-2.0 // diff --git a/backend/logger/logger.go b/backend/logger/logger.go index 78fa7774..c46c82cb 100644 --- a/backend/logger/logger.go +++ b/backend/logger/logger.go @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Open Networking Foundation +// Copyright 2019 free5GC.org // // SPDX-License-Identifier: Apache-2.0 // diff --git a/backend/webui_context/context.go b/backend/webui_context/context.go index 7e29a4eb..57090c8d 100644 --- a/backend/webui_context/context.go +++ b/backend/webui_context/context.go @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2021 Open Networking Foundation +// Copyright 2019 free5GC.org // // SPDX-License-Identifier: Apache-2.0 // diff --git a/backend/webui_service/webui_init.go b/backend/webui_service/webui_init.go index be467286..5ce7f8ce 100644 --- a/backend/webui_service/webui_init.go +++ b/backend/webui_service/webui_init.go @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Open Networking Foundation +// Copyright 2019 free5GC.org // // SPDX-License-Identifier: Apache-2.0 // diff --git a/config/default-ue-data.json.license b/config/default-ue-data.json.license index 9ad81767..e546cb2a 100644 --- a/config/default-ue-data.json.license +++ b/config/default-ue-data.json.license @@ -1,3 +1,4 @@ SPDX-FileCopyrightText: 2021 Open Networking Foundation + SPDX-License-Identifier: Apache-2.0 diff --git a/config/override-sample.json.license b/config/override-sample.json.license index 9ad81767..e546cb2a 100644 --- a/config/override-sample.json.license +++ b/config/override-sample.json.license @@ -1,3 +1,4 @@ SPDX-FileCopyrightText: 2021 Open Networking Foundation + SPDX-License-Identifier: Apache-2.0 diff --git a/configapi/.openapi-generator/FILES.license b/configapi/.openapi-generator/FILES.license index 9ad81767..e546cb2a 100644 --- a/configapi/.openapi-generator/FILES.license +++ b/configapi/.openapi-generator/FILES.license @@ -1,3 +1,4 @@ SPDX-FileCopyrightText: 2021 Open Networking Foundation + SPDX-License-Identifier: Apache-2.0 diff --git a/configapi/.openapi-generator/VERSION.license b/configapi/.openapi-generator/VERSION.license index 9ad81767..e546cb2a 100644 --- a/configapi/.openapi-generator/VERSION.license +++ b/configapi/.openapi-generator/VERSION.license @@ -1,3 +1,4 @@ SPDX-FileCopyrightText: 2021 Open Networking Foundation + SPDX-License-Identifier: Apache-2.0 diff --git a/configapi/README.md b/configapi/README.md index 7ebced6a..b62f26dc 100644 --- a/configapi/README.md +++ b/configapi/README.md @@ -1,5 +1,6 @@