Skip to content

Commit

Permalink
Revert "Crossmatch"
Browse files Browse the repository at this point in the history
  • Loading branch information
Demurest authored Oct 22, 2024
1 parent e7b87c9 commit be9244f
Show file tree
Hide file tree
Showing 18 changed files with 4 additions and 2,604 deletions.
13 changes: 2 additions & 11 deletions lightcurve/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,6 @@ RUN \
chmod +x tailwindcss && \
./tailwindcss -i /lightcurve/src/probability_api/templates/probability.css -o /compiled/probability.css


FROM node:22-alpine as tailwindcss_crossmatch
COPY ./lightcurve/ /lightcurve/
WORKDIR /lightcurve
RUN \
wget -nc https://github.com/tailwindlabs/tailwindcss/releases/download/v3.4.13/tailwindcss-linux-x64 -O tailwindcss && \
chmod +x tailwindcss && \
./tailwindcss -i /lightcurve/src/crossmatch_api/templates/crossmatch.css -o /compiled/crossmatch.css

FROM python:3.11-slim as production
RUN pip install poetry
COPY --from=builder /app /app
Expand All @@ -72,6 +63,6 @@ COPY --from=tailwindcss_lightcurve /compiled/main.css /app/src/api/static
COPY --from=tailwindcss_magstats /compiled/magstats.css /app/src/magstats_api/static
COPY --from=tailwindcss_object /compiled/object.css /app/src/object_api/static
COPY --from=tailwindcss_probability /compiled/probability.css /app/src/probability_api/static
COPY --from=tailwindcss_crossmatch /compiled/crossmatch.css /app/src/crossmatch_api/static
# COPY --from=tailwindcss_crossmatch /compiled/crossmatch.css /app/src/crossmatch_api/static
RUN poetry install --only-root
CMD ["bash", "scripts/entrypoint.sh"]
CMD ["bash", "scripts/entrypoint.sh"]
14 changes: 1 addition & 13 deletions lightcurve/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,4 @@ services:
- variables.env
environment:
SERVICE: probability_api
API_URL: http://localhost:8004

crossmatch:
build:
context: ../
dockerfile: lightcurve/Dockerfile
ports:
- 8005:8000
env_file:
- variables.env
environment:
SERVICE: crossmatch_api
API_URL: http://localhost:8005
API_URL: http://localhost:8004
11 changes: 0 additions & 11 deletions lightcurve/scripts/run_crossmatch.py

This file was deleted.

7 changes: 0 additions & 7 deletions lightcurve/scripts/run_dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,10 @@ def run_object():
port = int(os.getenv("PORT", default=8000))
asyncio.run(run_service("object_api", port))


def run_crossmatch():
port = int(os.getenv("PORT", default=8000))
asyncio.run(run_service("crossmatch_api", port))


def run_probability():
port = int(os.getenv("PORT", default=8000))
asyncio.run(run_service("probability_api", port))


async def run_services(services, port):
tasks = []
for i, service in enumerate(services):
Expand Down
Empty file.
33 changes: 0 additions & 33 deletions lightcurve/src/crossmatch_api/api.py

This file was deleted.

47 changes: 0 additions & 47 deletions lightcurve/src/crossmatch_api/filters.py

This file was deleted.

24 changes: 0 additions & 24 deletions lightcurve/src/crossmatch_api/get_crossmatch_data.py

This file was deleted.

37 changes: 0 additions & 37 deletions lightcurve/src/crossmatch_api/result_handler.py

This file was deleted.

Empty file.
47 changes: 0 additions & 47 deletions lightcurve/src/crossmatch_api/routes/htmx.py

This file was deleted.

30 changes: 0 additions & 30 deletions lightcurve/src/crossmatch_api/routes/rest.py

This file was deleted.

Loading

0 comments on commit be9244f

Please sign in to comment.