Skip to content

Commit

Permalink
Merge pull request #21 from lexis-solutions/development
Browse files Browse the repository at this point in the history
Merge branch 'development'
  • Loading branch information
fanSte8 authored Feb 25, 2022
2 parents cb7d0d3 + 1eb4a4d commit 8126612
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
docker:
runs-on: ubuntu-latest
env:
PUBLIC_URL: http://localhost:4000
PUBLIC_URL: http://localhost:7878
steps:
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN yarn

COPY . .

EXPOSE 4000
EXPOSE 7878

RUN GENERATE_SOURCEMAP=false yarn build

Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,24 @@ const app = express();
const agenda = new Agenda({ db: { address: 'mongodb://127.0.0.1/agendaDb' } });
mountAgendaAdmin({
publicUrl: 'http://localhost:4000/agenda-admin',
publicUrl: 'http://localhost:7878/agenda-admin',
expressApp: app,
agenda
});
app.listen(4000);
app.listen(7878);
```

---

### Docker usage

The docker container exposes port 4000
The docker container exposes port 7878

At this point, AgendaAdmin does not support port re-mapping, so the container should be connected to port 7878 only

```
docker run -p 4000:4000 \
docker run -p 7878:7878 \
--env CONNECTION_STRING=mongo://username:password@host/database \
--env COLLECTION=collection lexissolutions/agenda-admin:latest
```
Expand Down
2 changes: 1 addition & 1 deletion api/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ try {
getAgendaInstance()
.start()
.then(() => {
app.listen(4000, () => console.info('App running on port 4000'));
app.listen(7878, () => console.info('App running on port 7878'));
});
} catch (error: any) {
console.error(error.message);
Expand Down
3 changes: 0 additions & 3 deletions client/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ const App = () => {
</div>
<Header />
<JobsTable />
<div className="p-4 m-4">
<span>No data found.</span>
</div>
<Footer />
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions client/src/components/JobFilters.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ const JobFilters: React.FC = () => {
<JobNamesAutocomplete
renderInput={(props) => (
<InputField
className="w-full"
showButton={!!jobName}
onClear={() => setJobName('')}
inputProps={{
Expand Down Expand Up @@ -149,6 +150,7 @@ const JobFilters: React.FC = () => {
<div className="flex-1 form-control">
<label className="label">Refresh Interval (seconds)</label>
<InputField
className="w-full"
showButton={false}
onClear={() => null}
inputProps={{
Expand Down

0 comments on commit 8126612

Please sign in to comment.