diff --git a/Dockerfile-dev b/Dockerfile-dev index 74c199a..eb06f00 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -3,10 +3,7 @@ FROM node:14.17.0 # Informs Docker that the container listens on the # specified network ports at runtime EXPOSE 4000 -COPY . app/ # Changes working directory to the new directory just created WORKDIR /app -# Installs npm dependencies on container -RUN npm ci # Command container will actually run when called CMD ["npx", "nodemon", "-w", "src", "--ext", "ts", "--exec", "ts-node", "src/index.ts"] diff --git a/README.md b/README.md index 0368ad9..88f045e 100644 --- a/README.md +++ b/README.md @@ -3,17 +3,27 @@ Apollo graphql api server for Photowall ## Run it locally - Create an .env file (see .env.example for what to set). +### Development Run ``` +$ npm install $ docker compose build $ docker compose up ``` Then head over to [The playground GUI](https://localhost:4000) in the browser +See context function of src/index.ts for Authentication options for development. + +### Run prod-like container locally +Run +``` +$ docker compose -f docker-compose-prodlike.yml build +$ docker compose -f docker-compose-prodlike.yml up +``` + ## Run tests Scripts will create the insert sql files for a randomized fake data postgres database. This database is based of the actual db in photowall project. diff --git a/docker-compose-dev.yml b/docker-compose-prodlike.yml similarity index 67% rename from docker-compose-dev.yml rename to docker-compose-prodlike.yml index 7c8978c..0383913 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-prodlike.yml @@ -4,16 +4,14 @@ services: api: build: context: ./ - dockerfile: ./Dockerfile-dev - volumes: - - ./:/app + dockerfile: ./Dockerfile container_name: photowall.graphql hostname: graphql.local ports: - '4000:4000' environment: - COGNITO_POOL_ID=eu-west-1_3O4VfvPn7 - - DATABASE_URL=postgresql://fondberg:@docker.for.mac.localhost/photowall + - DATABASE_URL=${DATABASE_URL} networks: default: diff --git a/docker-compose.yml b/docker-compose.yml index 4d256fd..57012ed 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,16 +4,16 @@ services: api: build: context: ./ - dockerfile: ./Dockerfile - # volumes: - # - ./:/app + dockerfile: ./Dockerfile-dev + volumes: + - ./:/app container_name: photowall.graphql hostname: graphql.local ports: - '4000:4000' environment: - COGNITO_POOL_ID=eu-west-1_3O4VfvPn7 - - DATABASE_URL=postgresql://fondberg:@docker.for.mac.localhost/photowall + - DATABASE_URL=${DATABASE_URL} networks: default: