diff --git a/flake.nix b/flake.nix index 351b04c..0f66d1a 100644 --- a/flake.nix +++ b/flake.nix @@ -95,19 +95,7 @@ packages = forAllSystems (system: let pkgs = nixpkgs.legacyPackages.${system}; - pythonSet = pythonSets.${system}.overrideScope editableOverlay; - virtualenv = pythonSet.mkVirtualEnv "document-service-env" workspace.deps.default; - - # Create a derivation that includes the application code - appCode = pkgs.stdenv.mkDerivation { - name = "document-service-code"; - src = ./.; - installPhase = '' - mkdir -p $out/app - cp -r app/* $out/app/ - cp pyproject.toml $out/ - ''; - }; + virtualenv = pythonSets.${system}.mkVirtualEnv "document-service-env" workspace.deps.default; in { default = virtualenv; dockerImage = pkgs.dockerTools.buildLayeredImage { @@ -119,13 +107,12 @@ pkgs.shadow pkgs.file pkgs.git # Include git for version info - appCode # Include application code ]; config = { Cmd = ["/bin/python" "-m" "uvicorn" "app.main:app" "--host" "0.0.0.0" "--port" "8082"]; Env = [ "PYTHONUNBUFFERED=1" - "PYTHONPATH=/app" + "LD_LIBRARY_PATH=${pkgs.file.out}/lib" "S3_ENDPOINT" "S3_ACCESS_KEY" "S3_SECRET_KEY" @@ -135,7 +122,6 @@ "PORT" "LOG_LEVEL" ]; - WorkingDir = "/app"; }; }; }); diff --git a/ops/chart/values.yaml b/ops/chart/values.yaml index 9600a4a..cc591c2 100644 --- a/ops/chart/values.yaml +++ b/ops/chart/values.yaml @@ -56,23 +56,3 @@ service: port: 8082 protocol: HTTP -external-secret: - enabled: true - apiVersion: external-secrets.io/v1 - kind: ExternalSecret - suffix: secrets - spec: - spec: - refreshInterval: 0s - secretStoreRef: - name: cluster-secrets-store - kind: ClusterSecretStore - target: - name: '{{ include "bjw.common.lib.chart.names.fullname $ }}-secrets' - creationPolicy: Owner - dataFrom: - - sourceRef: - generatorRef: - apiVersion: generators.external-secrets.io/v1alpha1 - kind: Password - name: '{{ include "bjw.common.lib.chart.names.fullname $ }}-password-generator'