From 1058efb17a607d0a0fb975df3a493d73b08ef7fb Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Wed, 8 May 2024 20:53:47 -0700 Subject: [PATCH] Remove all unnecessary Dockerfiles from repo (#3340) --- .dockerignore | 7 ---- .github/workflows/jobs.yaml | 56 ++++++++++++++++---------------- .github/workflows/vulncheck.yaml | 4 +-- DEVELOPMENT.md | 19 ----------- Dockerfile | 43 ------------------------ Dockerfile.assets | 14 -------- Dockerfile.release | 27 --------------- 7 files changed, 30 insertions(+), 140 deletions(-) delete mode 100644 .dockerignore delete mode 100644 Dockerfile delete mode 100644 Dockerfile.assets delete mode 100644 Dockerfile.release diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index c615037d42..0000000000 --- a/.dockerignore +++ /dev/null @@ -1,7 +0,0 @@ -node_modules/ -dist/ -target/ -console -!console/ -web-app/node_modules/ -.git/ diff --git a/.github/workflows/jobs.yaml b/.github/workflows/jobs.yaml index d53d871667..37825f253d 100644 --- a/.github/workflows/jobs.yaml +++ b/.github/workflows/jobs.yaml @@ -22,7 +22,7 @@ jobs: runs-on: [ ubuntu-latest ] strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -111,7 +111,7 @@ jobs: runs-on: [ ubuntu-latest ] strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] steps: # To build minio image, we need to clone the repository first - name: Clone github.com/minio/minio @@ -137,7 +137,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -177,7 +177,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -226,7 +226,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -274,7 +274,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -321,7 +321,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -368,7 +368,7 @@ jobs: timeout-minutes: 15 strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -411,7 +411,7 @@ jobs: runs-on: [ ubuntu-latest ] strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -454,7 +454,7 @@ jobs: runs-on: [ ubuntu-latest ] strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -497,7 +497,7 @@ jobs: runs-on: [ ubuntu-latest ] strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -539,7 +539,7 @@ jobs: runs-on: [ ubuntu-latest ] strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -582,7 +582,7 @@ jobs: runs-on: [ ubuntu-latest ] strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -628,7 +628,7 @@ jobs: runs-on: [ ubuntu-latest ] strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -676,7 +676,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -712,7 +712,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -750,7 +750,7 @@ jobs: strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] steps: - name: Check out code @@ -833,7 +833,7 @@ jobs: strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] steps: - name: Check out code @@ -904,7 +904,7 @@ jobs: strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] steps: - name: Check out code @@ -972,7 +972,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -1118,7 +1118,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -1158,7 +1158,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -1199,7 +1199,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -1228,7 +1228,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -1256,7 +1256,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -1285,7 +1285,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code @@ -1314,7 +1314,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - go-version: [ 1.21.x ] + go-version: [ 1.22.x ] os: [ ubuntu-latest ] steps: - name: Check out code diff --git a/.github/workflows/vulncheck.yaml b/.github/workflows/vulncheck.yaml index 55e611ac8a..e4e980c71c 100644 --- a/.github/workflows/vulncheck.yaml +++ b/.github/workflows/vulncheck.yaml @@ -22,7 +22,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.21.9 + go-version: 1.22.3 check-latest: true - name: Get official govulncheck run: go install golang.org/x/vuln/cmd/govulncheck@latest @@ -36,7 +36,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go-version: [ 1.21.8 ] + go-version: [ 1.22.3 ] os: [ ubuntu-latest ] steps: - name: Check out code diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index ff7f481bdf..420021fc5c 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -77,25 +77,6 @@ Still in the MinIO folder, run make build ``` -# Testing on Kubernetes - -If you want to test console on kubernetes, you can perform all the steps from `Building with MinIO`, but change `Step 3` -to the following: - -```shell -TAG=miniodev/console:dev make docker -``` - -This will build a docker container image that can be used to test with your local kubernetes environment. - -For example, if you are using kind: - -```shell -kind load docker-image miniodev/console:dev -``` - -and then deploy any `Tenant` that uses this image - # LDAP authentication with Console ## Setup diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index c188ae4457..0000000000 --- a/Dockerfile +++ /dev/null @@ -1,43 +0,0 @@ -ARG NODE_VERSION -FROM node:$NODE_VERSION as uilayer - -WORKDIR /app - -COPY ./web-app/package.json ./ -COPY ./web-app/yarn.lock ./ -RUN yarn install - -COPY ./web-app . - -RUN make build-static - -USER node - -FROM golang:1.19 as golayer - -RUN apt-get update -y && apt-get install -y ca-certificates - -ADD go.mod /go/src/github.com/minio/console/go.mod -ADD go.sum /go/src/github.com/minio/console/go.sum -WORKDIR /go/src/github.com/minio/console/ - -# Get dependencies - will also be cached if we won't change mod/sum -RUN go mod download - -ADD . /go/src/github.com/minio/console/ -WORKDIR /go/src/github.com/minio/console/ - -ENV CGO_ENABLED=0 - -COPY --from=uilayer /app/build /go/src/github.com/minio/console/web-app/build -RUN go build --tags=kqueue,operator -ldflags "-w -s" -a -o console ./cmd/console - -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7 -MAINTAINER MinIO Development "dev@min.io" -EXPOSE 9090 - - -COPY --from=golayer /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=golayer /go/src/github.com/minio/console/console . - -ENTRYPOINT ["/console"] diff --git a/Dockerfile.assets b/Dockerfile.assets deleted file mode 100644 index 2e08153aab..0000000000 --- a/Dockerfile.assets +++ /dev/null @@ -1,14 +0,0 @@ -ARG NODE_VERSION -FROM node:$NODE_VERSION as uilayer - -WORKDIR /app - -COPY ./web-app/package.json ./ -COPY ./web-app/yarn.lock ./ -RUN yarn install - -COPY ./web-app . - -RUN yarn install && make build-static - -USER node diff --git a/Dockerfile.release b/Dockerfile.release deleted file mode 100644 index cb92df7e2d..0000000000 --- a/Dockerfile.release +++ /dev/null @@ -1,27 +0,0 @@ -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.2 as build - -RUN microdnf update --nodocs && microdnf install ca-certificates --nodocs - -FROM registry.access.redhat.com/ubi9/ubi-micro:9.2 - -ARG TAG - -LABEL name="MinIO" \ - vendor="MinIO Inc " \ - maintainer="MinIO Inc " \ - version="${TAG}" \ - release="${TAG}" \ - summary="A graphical user interface for MinIO" \ - description="MinIO object storage is fundamentally different. Designed for performance and the S3 API, it is 100% open-source. MinIO is ideal for large, private cloud environments with stringent security requirements and delivers mission-critical availability across a diverse range of workloads." - -# On RHEL the certificate bundle is located at: -# - /etc/pki/tls/certs/ca-bundle.crt (RHEL 6) -# - /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem (RHEL 7) -COPY --from=build /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem /etc/pki/ca-trust/extracted/pem/ -COPY LICENSE /LICENSE -COPY CREDITS /CREDITS -COPY console /console - -EXPOSE 9090 - -ENTRYPOINT ["/console"]