Merge branch 'main' into redis

.github/actions/integration-test/action.yml

@@ -10,7 +10,7 @@ inputs:
     required: false
 runs:
   using: "docker"
-  image: "docker://ghcr.io/markphelps/flipt-integration-test"
+  image: "docker://ghcr.io/flipt-io/flipt-integration-test"
   args:
     - ${{ inputs.script }}
     - ${{ inputs.config }}

.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
 

.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}}"

CHANGELOG.md

@@ -21,6 +21,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `cache.memory.enabled` config value is deprecated. See [Deprecations](DEPRECATIONS.md) for more info
 - `cache.memory.expiration` config value is deprecated. See [Deprecations](DEPRECATIONS.md) for more info
 
+### Fixed
+
+- Build date was incorrect and always showed current date/time
+
 ## [v1.9.0](https://github.com/markphelps/flipt/releases/tag/v1.9.0) - 2022-07-06
 
 ### Changed

DEVELOPMENT.md

@@ -15,7 +15,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.
@@ -56,13 +56,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 `task dev` 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 for any changes in the server (Go) code :exclamation:
 
@@ -86,4 +86,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)

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

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).

Taskfile.yml

@@ -11,11 +11,13 @@ tasks:
     desc: Build the binary
     deps: [prep]
     cmds:
-      - go build -trimpath -tags assets -ldflags "-X main.commit={{.GIT_COMMIT}}" -o {{.OUTPUT}}/{{.PROJECT}} ./cmd/{{.PROJECT}}/.
+      - go build -trimpath -tags assets -ldflags "-X main.commit={{.GIT_COMMIT}} -X main.date={{.BUILD_DATE}}" -o {{.OUTPUT}}/{{.PROJECT}} ./cmd/{{.PROJECT}}/.
     vars:
       OUTPUT: '{{default "./bin" .OUTPUT}}'
       GIT_COMMIT:
         sh: set -e && git rev-parse --verify HEAD || ""
+      BUILD_DATE:
+        sh: date -u +%Y-%m-%dT%H:%M:%SZ
 
   prep:
     desc: Prepare for release

cmd/flipt/main.go

@@ -81,7 +81,7 @@ var (
 
 	version      = devVersion
 	commit       string
-	date         = time.Now().UTC().Format(time.RFC3339)
+	date         string
 	goVersion    = runtime.Version()
 	analyticsKey string
 	banner       string

docker-compose.yml

@@ -2,6 +2,6 @@ version: "3"
 
 services:
   flipt:
-    image: markphelps/flipt:latest
+    image: flipt/flipt:latest
     ports:
       - "8080:8080"

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

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:

examples/mysql/Dockerfile

@@ -1,4 +1,4 @@
-FROM markphelps/flipt:latest
+FROM flipt/flipt:latest
 
 RUN apk update && apk add --no-cache git bash
 

examples/postgres/Dockerfile

@@ -1,4 +1,4 @@
-FROM markphelps/flipt:latest
+FROM flipt/flipt:latest
 
 RUN apk update && apk add --no-cache git bash
 

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:

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:

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 {