Skip to content

Commit

Permalink
Rename project to Dirigent
Browse files Browse the repository at this point in the history
  • Loading branch information
codedmonkey committed Dec 17, 2024
1 parent a4adb49 commit c3ab691
Show file tree
Hide file tree
Showing 121 changed files with 515 additions and 535 deletions.
4 changes: 2 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/config/conductor.yaml
/config/packages/conductor.yaml
/config/dirigent.yaml
/config/packages/dirigent.yaml
/storage/
/var/
/vendor/
10 changes: 5 additions & 5 deletions .env.conductor → .env.dirigent
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# In all environments, the following files are loaded if they exist,
# the latter taking precedence over the former:
#
# * .env.conductor contains default values for the environment variables needed by the app
# * .env.conductor.local uncommitted file with local overrides
# * .env.conductor.$APP_ENV committed environment-specific defaults
# * .env.conductor.$APP_ENV.local uncommitted environment-specific overrides
# * .env.dirigent contains default values for the environment variables needed by the app
# * .env.dirigent.local uncommitted file with local overrides
# * .env.dirigent.$APP_ENV committed environment-specific defaults
# * .env.dirigent.$APP_ENV.local uncommitted environment-specific overrides
#
# Real environment variables win over .env files.
#
Expand All @@ -28,7 +28,7 @@ APP_SECRET=e52f905e642cf4299efe685742c4b171
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
# DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=8.0.32&charset=utf8mb4"
# DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
DATABASE_URL="postgresql://conductor:[email protected]:5432/conductor?serverVersion=16&charset=utf8"
DATABASE_URL="postgresql://dirigent:[email protected]:5432/dirigent?serverVersion=16&charset=utf8"
###< doctrine/doctrine-bundle ###

###> sentry/sentry-symfony ###
Expand Down
2 changes: 1 addition & 1 deletion .env.conductor.test → .env.dirigent.test
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# define your env variables for the test env here
KERNEL_CLASS='CodedMonkey\Conductor\Kernel'
KERNEL_CLASS='CodedMonkey\Dirigent\Kernel'
APP_SECRET='$ecretf0rt3st'
SYMFONY_DEPRECATIONS_HELPER=999999
PANTHER_APP_ENV=panther
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ jobs:
ports:
- "5432:5432"
env:
POSTGRES_DB: conductor
POSTGRES_DB: dirigent
POSTGRES_PASSWORD: "!ChangeMe!"
POSTGRES_USER: conductor
POSTGRES_USER: dirigent

steps:
- name: Checkout code
Expand Down
10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/.env
/compose.override.yaml
/config/conductor.yaml
/config/packages/conductor.yaml
/config/dirigent.yaml
/config/packages/dirigent.yaml
/storage/

###> symfony/framework-bundle ###
/.env.conductor.local
/.env.conductor.local.php
/.env.conductor.*.local
/.env.dirigent.local
/.env.dirigent.local.php
/.env.dirigent.*.local
/config/secrets/prod/prod.decrypt.private.php
/public/bundles/
/var/
Expand Down
40 changes: 20 additions & 20 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ RUN set -e; \

FROM alpine:3.19

LABEL org.opencontainers.image.source=https://github.com/codedmonkey/conductor
LABEL org.opencontainers.image.description="Conductor PHP Package Registry"
LABEL org.opencontainers.image.source=https://github.com/codedmonkey/dirigent
LABEL org.opencontainers.image.description="Dirigent PHP Package Registry"
LABEL org.opencontainers.image.licenses=FSL-1.1-MIT

ARG UID=1000
ARG GID=1000

RUN set -e; \
addgroup -g $GID -S conductor; \
adduser -u $UID -S -G conductor conductor; \
addgroup -g $GID -S dirigent; \
adduser -u $UID -S -G dirigent dirigent; \
apk upgrade --no-cache; \
apk add --no-cache --upgrade \
caddy \
Expand All @@ -62,7 +62,7 @@ RUN set -e; \
supervisor; \
ln -s /usr/sbin/php-fpm82 /usr/sbin/php-fpm; \
mkdir -p /run/postgresql /srv/config; \
chown -R conductor:conductor /run /srv;
chown -R dirigent:dirigent /run /srv;

COPY --from=composer_build /usr/bin/composer /usr/bin/composer

Expand All @@ -73,27 +73,27 @@ COPY docker/php-fpm.conf /etc/php82/
COPY docker/supervisord.conf /etc/
COPY docker/process /srv/process/

USER conductor
USER dirigent

ENV APP_ENV="prod"
ENV DATABASE_URL="postgresql://conductor@127.0.0.1:5432/conductor?serverVersion=16&charset=utf8"
ENV DATABASE_URL="postgresql://dirigent@127.0.0.1:5432/dirigent?serverVersion=16&charset=utf8"
ENV CONDUCTOR_IMAGE=1

WORKDIR /srv/app

COPY --chown=conductor:conductor --from=composer_build /srv/app ./
COPY --chown=conductor:conductor --from=node_build /srv/app/public/build public/build/
COPY --chown=conductor:conductor readme.md license.md ./
COPY --chown=conductor:conductor .env.conductor ./
COPY --chown=conductor:conductor bin bin/
COPY --chown=conductor:conductor config config/
COPY --chown=conductor:conductor migrations migrations/
COPY --chown=conductor:conductor public public/
COPY --chown=conductor:conductor src src/
COPY --chown=conductor:conductor translations translations/
COPY --chown=conductor:conductor templates templates/

COPY docker/conductor.yaml /srv/app/config/packages/
COPY --chown=dirigent:dirigent --from=composer_build /srv/app ./
COPY --chown=dirigent:dirigent --from=node_build /srv/app/public/build public/build/
COPY --chown=dirigent:dirigent readme.md license.md ./
COPY --chown=dirigent:dirigent .env.dirigent ./
COPY --chown=dirigent:dirigent bin bin/
COPY --chown=dirigent:dirigent config config/
COPY --chown=dirigent:dirigent migrations migrations/
COPY --chown=dirigent:dirigent public public/
COPY --chown=dirigent:dirigent src src/
COPY --chown=dirigent:dirigent translations translations/
COPY --chown=dirigent:dirigent templates templates/

COPY docker/dirigent.yaml /srv/app/config/packages/

RUN set -e; \
chmod +x bin/console; \
Expand Down
2 changes: 1 addition & 1 deletion assets/dashboard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

import './bootstrap';

import './stylesheets/conductor-theme.css';
import './stylesheets/dashboard-theme.css';
66 changes: 0 additions & 66 deletions assets/stylesheets/conductor-theme.css

This file was deleted.

66 changes: 66 additions & 0 deletions assets/stylesheets/dashboard-theme.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
:root {
--dirigent-primary: #22181C;

--color-primary: var(--dirigent-primary);

--page-login-bg: var(--dirigent-primary);

--sidebar-bg: var(--color-primary);
--sidebar-logo-color: var(--true-gray-200);
--sidebar-menu-color: var(--true-gray-200);
--sidebar-menu-header-color: var(--gray-400);
--sidebar-menu-icon-color: var(--gray-400);
--sidebar-menu-active-item-bg: #543B45;
--sidebar-menu-active-item-color: #FFB3C1;

--resize-handler-hover-bg: #835D6C;

--code-color: var(--text-color);
}

.ea-dark-scheme {
--dirigent-primary: #543B45;
--dirigent-primary-heavy: #835D6C;
--dirigent-primary-subtle: #22181C;
--dirigent-secondary: #FFB3C1;
--dirigent-secondary-subtle: #dc8494;
--dirigent-body-bg: #111517;
--dirigent-body-bg-subtle: rgb(25, 31, 34);
--dirigent-body-bg-subtle-rgb: 25, 31, 34;

--color-primary: var(--dirigent-primary);

--body-bg: var(--dirigent-body-bg);

--page-login-bg: var(--dirigent-body-bg);
--page-login-form-bg: var(--dirigent-body-bg-subtle);

--sidebar-bg: var(--dirigent-primary-subtle);
--sidebar-logo-color: var(--true-gray-200);
--sidebar-menu-color: var(--true-gray-200);
--sidebar-menu-header-color: var(--gray-400);
--sidebar-menu-icon-color: var(--gray-400);
--sidebar-menu-active-item-bg: var(--dirigent-primary);
--sidebar-menu-active-item-color: var(--dirigent-secondary);

--resize-handler-hover-bg: var(--dirigent-primary);

--dropdown-settings-active-item-color: var(--dirigent-secondary);

--button-primary-bg: var(--dirigent-primary);

--link-color: var(--dirigent-secondary-subtle);
--link-hover-color: var(--dirigent-secondary);

--code-color: var(--text-color);

--bs-border-color: var(--dirigent-primary);
}

.nav-pills {
--bs-nav-pills-link-active-bg: var(--color-primary);
}

.ea-dark-scheme .bg-body-secondary {
--bs-secondary-bg-rgb: var(--dirigent-body-bg-subtle-rgb);
}
2 changes: 1 addition & 1 deletion bin/console
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php

use CodedMonkey\Conductor\Kernel;
use CodedMonkey\Dirigent\Kernel;
use Symfony\Bundle\FrameworkBundle\Console\Application;

if (!is_dir(dirname(__DIR__) . '/vendor')) {
Expand Down
2 changes: 1 addition & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* Added resolving of README files from VCS repositories
* Added package download tracking
* Improved validation of VCS repositories
* Fixed an issue where the API returned the output from external registries instead of Conductor
* Fixed an issue where the API returned the output from external registries instead of Dirigent

* 0.1.0 (2024-08-03)
* Initial release
4 changes: 2 additions & 2 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ services:
ports:
- "5432"
environment:
POSTGRES_DB: ${POSTGRES_DB:-conductor}
POSTGRES_DB: ${POSTGRES_DB:-dirigent}
# You should definitely change the password in production
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-!ChangeMe!}
POSTGRES_USER: ${POSTGRES_USER:-conductor}
POSTGRES_USER: ${POSTGRES_USER:-dirigent}
healthcheck:
test: ["CMD", "pg_isready"]
timeout: 5s
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "codedmonkey/conductor",
"name": "codedmonkey/dirigent",
"description": "A free and open package registry for Composer",
"type": "project",
"license": "FSL-1.1-MIT",
Expand Down Expand Up @@ -83,12 +83,12 @@
},
"autoload": {
"psr-4": {
"CodedMonkey\\Conductor\\": "src/"
"CodedMonkey\\Dirigent\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"CodedMonkey\\Conductor\\Tests\\": "tests/"
"CodedMonkey\\Dirigent\\Tests\\": "tests/"
}
},
"scripts": {
Expand All @@ -113,7 +113,7 @@
},
"extra": {
"runtime": {
"dotenv_path": ".env.conductor"
"dotenv_path": ".env.dirigent"
},
"symfony": {
"allow-contrib": false,
Expand Down
Loading

0 comments on commit c3ab691

Please sign in to comment.