diff --git a/.github/settings.yml b/.github/settings.yml index b20efe1..d636c3c 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -1,13 +1,13 @@ repository: name: fabric-baseimage - description: null + description: Deprecated Fabric Base Images homepage: https://wiki.hyperledger.org/display/fabric - default_branch: master + default_branch: main has_downloads: true has_issues: false has_projects: false has_wiki: false - archived: false + archived: true private: false allow_squash_merge: true allow_merge_commit: false diff --git a/MAINTAINERS.md b/MAINTAINERS.md index b79c395..12e0206 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -1,7 +1,7 @@ ## Maintainers This repository is part of the Fabric project. -Please consult [Fabric's MAINTAINERS documentation](https://github.com/hyperledger/fabric/blob/master/MAINTAINERS.md) for the list of people maintaining this repository. +Please consult [Fabric's MAINTAINERS documentation](https://github.com/hyperledger/fabric/blob/main/MAINTAINERS.md) for the list of people maintaining this repository. Creative Commons License
This work is licensed under a Creative Commons Attribution 4.0 International License. s diff --git a/README.md b/README.md index 0776be0..94cff0b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,15 @@ +# :warning: Deprecation Notice + +The Fabric-Baseimage repository and the images built from this repository are deprecated. Critical bugs will continue to be patched through the Fabric 1.4.x LTS lifecycle. The images affected by this deprecation are: + +- hyperledger/fabric-baseimage (with a version < 1.0.0) +- hyperledger/fabric-baseos (with a version < 1.0.0) +- hyperledger/fabric-couchdb (all versions) +- hyperledger/fabric-zookeeper (all versions) +- hyperledger/fabric-kafka (all versions) + +Users should migrate to open source versions of these images. + # Baseimage Introduction This directory contains the infrastructure for creating a new baseimage used as the basis for various docker images consumed within the Hyperledger Fabric workflow such as chaincode compilation/execution, unit-testing, and even cluster simulation. It is based on ubuntu-16.04 with various opensource projects added such as golang, grpc, and node.js. The actual Hyperledger code is injected just-in-time before deployment. The resulting images are published to image registries such as [hub.docker.com][fabric-baseimage]. @@ -6,7 +18,8 @@ The purpose of this baseimage is to act as a bridge between a raw ubuntu/xenial Therefore, the expensive FOSS components are built into this baseimage once and subsequently cached on the public repositories so that workflows may simply consume the objects without requiring a local build cycle. -# Intended Audience + +## Intended Audience This repository is only intended for release managers curating the base images. Typical developers may safely ignore this completely. Anyone wishing to customize their image is encouraged to do so via downstream means, such as a custom Dockerfile. @@ -14,7 +27,7 @@ This repository is only intended for release managers curating the base images. If a component is found to be both broadly applicable and expensive to build JIT, it may be a candidate for inclusion in a future baseimage. -# Usage +## Usage * "make docker" will build the docker images and commit it to your local environment; e.g. "hyperledger/fabric-baseimage". The docker image is also tagged with architecture and release details. * "make install" build build the docker images and push them to Docker Hub. diff --git a/ci/azure-pipelines-release.yml b/ci/azure-pipelines-release.yml index 09d04e6..9c07589 100644 --- a/ci/azure-pipelines-release.yml +++ b/ci/azure-pipelines-release.yml @@ -11,7 +11,7 @@ variables: - name: GOPATH value: $(Agent.BuildDirectory)/go - name: GOVER - value: 1.13.12 + value: 1.14.12 stages: - stage: BuildAndPushDockerImages diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index 95ade40..07a40c7 100644 --- a/ci/azure-pipelines.yml +++ b/ci/azure-pipelines.yml @@ -4,9 +4,9 @@ name: $(SourceBranchName)-$(Date:yyyyMMdd)$(Rev:.rrr) trigger: -- master +- main pr: -- master +- main jobs: - job: VerifyBuild diff --git a/images/couchdb/Dockerfile b/images/couchdb/Dockerfile index b973759..a27a48a 100644 --- a/images/couchdb/Dockerfile +++ b/images/couchdb/Dockerfile @@ -1,6 +1,6 @@ # Copyright Greg Haskins All Rights Reserved # SPDX-License-Identifier: Apache-2.0 -# Based on https://github.com/apache/couchdb-docker/blob/master/2.1.1/Dockerfile +# Based on https://github.com/apache/couchdb-docker/blob/main/2.1.1/Dockerfile FROM debian:stretch-20190910-slim diff --git a/scripts/common/setup.sh b/scripts/common/setup.sh index b5bb73d..9f03c04 100755 --- a/scripts/common/setup.sh +++ b/scripts/common/setup.sh @@ -32,7 +32,7 @@ export GOROOT="/opt/go" mkdir -p $GOPATH ARCH=`uname -m | sed 's|i686|386|' | sed 's|x86_64|amd64|'` BINTARGETS="x86_64 ppc64le s390x" -GO_VER=1.13.12 +GO_VER=1.14.12 # Install Golang binary if found in BINTARGETS if echo $BINTARGETS | grep -q `uname -m`; then