From e2b8e7464bb2f19b46df25023e9d0742c40ec9d0 Mon Sep 17 00:00:00 2001 From: Mark Phelps <209477+markphelps@users.noreply.github.com> Date: Sun, 24 Jul 2022 10:20:23 -0400 Subject: [PATCH] update most remaining namespace refs (#955) * update most remaining namespace refs * try packages write perm --- .github/actions/integration-test/action.yml | 2 +- .github/workflows/integration-test-image.yml | 5 ++++- .goreleaser.yml | 10 ++++++---- DEVELOPMENT.md | 8 ++++---- Dockerfile.it | 2 +- README.md | 2 +- docker-compose.yml | 2 +- examples/auth/docker-compose.yml | 2 +- examples/basic/docker-compose.yml | 2 +- examples/mysql/Dockerfile | 2 +- examples/postgres/Dockerfile | 2 +- examples/prometheus/docker-compose.yml | 2 +- examples/tracing/docker-compose.yml | 2 +- rpc/flipt/marshaller.go | 2 +- 14 files changed, 25 insertions(+), 20 deletions(-) diff --git a/.github/actions/integration-test/action.yml b/.github/actions/integration-test/action.yml index 52c14114f7..b034aa2e50 100644 --- a/.github/actions/integration-test/action.yml +++ b/.github/actions/integration-test/action.yml @@ -7,6 +7,6 @@ inputs: required: true runs: using: "docker" - image: "docker://ghcr.io/markphelps/flipt-integration-test" + image: "docker://ghcr.io/flipt-io/flipt-integration-test" args: - ${{ inputs.args }} diff --git a/.github/workflows/integration-test-image.yml b/.github/workflows/integration-test-image.yml index e7f7a472f5..3cc8cb99f9 100644 --- a/.github/workflows/integration-test-image.yml +++ b/.github/workflows/integration-test-image.yml @@ -4,6 +4,9 @@ on: schedule: - cron: 10 0 * * 0 # weekly, sunday at 00:10 +permissions: + packages: write + jobs: build: name: Build @@ -34,7 +37,7 @@ jobs: context: . file: Dockerfile.it push: true - tags: ghcr.io/markphelps/flipt-integration-test:latest + tags: ghcr.io/flipt-io/flipt-integration-test:latest cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new diff --git a/.goreleaser.yml b/.goreleaser.yml index 96210a3618..d46c367960 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -40,10 +40,12 @@ dockers: - dockerfile: ./build/Dockerfile use: buildx image_templates: - - "markphelps/flipt:latest" - - "markphelps/flipt:{{ .Tag }}" - - "ghcr.io/markphelps/flipt:latest" - - "ghcr.io/markphelps/flipt:{{ .Tag }}" + - "flipt/flipt:latest" + - "flipt/flipt:{{ .Tag }}" + - "markphelps/flipt:latest" # TODO: deprecate + - "markphelps/flipt:{{ .Tag }}" # TODO: deprecate + - "ghcr.io/markphelps/flipt:latest" # TODO: deprecate + - "ghcr.io/markphelps/flipt:{{ .Tag }}" # TODO: deprecate build_flag_templates: - "--label=org.opencontainers.image.created={{.Date}}" - "--label=org.opencontainers.image.revision={{.FullCommit}}" diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index bda22e7b2a..59f5874dbe 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -14,7 +14,7 @@ Before starting, make sure you have the following installed: ## Setup -1. Clone this repo: `git clone https://github.com/markphelps/flipt` +1. Clone this repo: `git clone https://github.com/flipt-io/flipt` 1. Run `task bootstrap` to install required development tools. See [#bootstrap](#bootstrap) below. 1. Run `task test` to execute the test suite 1. Run `task dev` to run the server and ui in development mode. @@ -57,13 +57,13 @@ Running `task assets` will regenerate the embedded assets (ui, api documentation The UI is built using [NPM](https://nodejs.org/en/) and [Vite](https://vitejs.dev/) and is also statically compiled into the Flipt binary. -The [ui/README.md](https://github.com/markphelps/flipt/tree/main/ui/README.md) has more information on how to build the UI and also how to run it locally during development. +The [ui/README.md](https://github.com/flipt-io/flipt/tree/main/ui/README.md) has more information on how to build the UI and also how to run it locally during development. ## Building/Running **Run `script/server` from the project root.** -Vite will rebuild the UI assets when applicable files in the `ui` folder change. See [ui/README.md](https://github.com/markphelps/flipt/tree/main/ui/README.md) for more info. +Vite will rebuild the UI assets when applicable files in the `ui` folder change. See [ui/README.md](https://github.com/flipt-io/flipt/tree/main/ui/README.md) for more info. You'll need to stop and re-run `script/server` for any changes in the server (Go) code :exclamation: @@ -87,4 +87,4 @@ For VSCode Remote Containers (devcontainers), make sure you have [Docker](https: If you have access to [GitHub Codespaces](https://github.com/features/codespaces), simply open Flipt in a codespaces from the `Code` tab in the repo on GitHub or click the button below. -[![Open in Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new/?repo=markphelps/flipt) +[![Open in Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new/?repo=flipt-io/flipt) diff --git a/Dockerfile.it b/Dockerfile.it index fdcb353979..22ac9fb8e0 100644 --- a/Dockerfile.it +++ b/Dockerfile.it @@ -1,6 +1,6 @@ FROM ubuntu:focal -LABEL org.opencontainers.image.source="https://github.com/markphelps/flipt" +LABEL org.opencontainers.image.source="https://github.com/flipt-io/flipt" ENV DEBIAN_FRONTEND noninteractive ENV DEBCONF_NONINTERACTIVE_SEEN true diff --git a/README.md b/README.md index 14b39bb05a..53853c59b1 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ Try the latest version of Flipt out for yourself. ![Flipt](cli.gif) ```bash -❯ docker run --rm -p 8080:8080 -p 9000:9000 -t markphelps/flipt:latest +❯ docker run --rm -p 8080:8080 -p 9000:9000 -t flipt/flipt:latest ``` Flipt UI will now be reachable at [http://127.0.0.1:8080/](http://127.0.0.1:8080). diff --git a/docker-compose.yml b/docker-compose.yml index 09595d8a2a..c43e281b40 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,6 +2,6 @@ version: "3" services: flipt: - image: markphelps/flipt:latest + image: flipt/flipt:latest ports: - "8080:8080" diff --git a/examples/auth/docker-compose.yml b/examples/auth/docker-compose.yml index 9b0fb9c448..b34438a621 100644 --- a/examples/auth/docker-compose.yml +++ b/examples/auth/docker-compose.yml @@ -14,7 +14,7 @@ services: - HTTP_PASSWORD=password flipt: - image: markphelps/flipt:latest + image: flipt/flipt:latest # Note: no ports are exposed publicly as Caddy acts as a reverse proxy, # proxying all requests to 8080 to the Flipt container depends_on: caddy diff --git a/examples/basic/docker-compose.yml b/examples/basic/docker-compose.yml index 7d2bc68e2a..4eb96dc02c 100644 --- a/examples/basic/docker-compose.yml +++ b/examples/basic/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: flipt: - image: markphelps/flipt:latest + image: flipt/flipt:latest ports: - "8080:8080" networks: diff --git a/examples/mysql/Dockerfile b/examples/mysql/Dockerfile index 6a3c136f57..02d539c9e5 100644 --- a/examples/mysql/Dockerfile +++ b/examples/mysql/Dockerfile @@ -1,4 +1,4 @@ -FROM markphelps/flipt:latest +FROM flipt/flipt:latest RUN apk update && apk add --no-cache git bash diff --git a/examples/postgres/Dockerfile b/examples/postgres/Dockerfile index 6a3c136f57..02d539c9e5 100644 --- a/examples/postgres/Dockerfile +++ b/examples/postgres/Dockerfile @@ -1,4 +1,4 @@ -FROM markphelps/flipt:latest +FROM flipt/flipt:latest RUN apk update && apk add --no-cache git bash diff --git a/examples/prometheus/docker-compose.yml b/examples/prometheus/docker-compose.yml index 5b13e4eeb7..a824e7051d 100644 --- a/examples/prometheus/docker-compose.yml +++ b/examples/prometheus/docker-compose.yml @@ -11,7 +11,7 @@ services: - flipt_network flipt: - image: markphelps/flipt:latest + image: flipt/flipt:latest depends_on: - prometheus ports: diff --git a/examples/tracing/docker-compose.yml b/examples/tracing/docker-compose.yml index 85f2dda274..2fe1733afd 100644 --- a/examples/tracing/docker-compose.yml +++ b/examples/tracing/docker-compose.yml @@ -11,7 +11,7 @@ services: - "COLLECTOR_ZIPKIN_HTTP_PORT=9411" flipt: - image: markphelps/flipt:latest + image: flipt/flipt:latest depends_on: - jaeger ports: diff --git a/rpc/flipt/marshaller.go b/rpc/flipt/marshaller.go index 6de20f723e..391a83548c 100644 --- a/rpc/flipt/marshaller.go +++ b/rpc/flipt/marshaller.go @@ -15,7 +15,7 @@ var _ grpc_gateway_v2.Marshaler = &V1toV2MarshallerAdapter{} // This is required to fix a backwards compatibility issue with the v2 marshaller where `null` map values // cause an error because they are not allowed by the proto spec, but they were handled by the v1 marshaller. // -// See: https://github.com/markphelps/flipt/issues/664 +// See: https://github.com/flipt-io/flipt/issues/664 // // TODO: remove this custom marshaller for Flipt API v2 as we want to use the default v2 marshaller directly. type V1toV2MarshallerAdapter struct {